fixed code style on all source files (*.c *.cpp *.h) using astyle --style=allman --lineend=linux --indent=tab --pad-oper

1 files changed, 275 insertions, 275 deletions

diff --git a/pica-client/main.cpp b/pica-client/main.cpp
index 1441b5c..cadc6d5 100644
--- a/pica-client/main.cpp
+++ b/pica-client/main.cpp
@@ -49,27 +49,27 @@ QString snd_newmessage("share\\picapica-snd-newmessage.wav");
 
 static bool create_database()
 {
-    QMessageBox msgBox;
+	QMessageBox msgBox;
 
-    QSqlDatabase dbconn=QSqlDatabase::addDatabase("QSQLITE");
-    dbconn.setDatabaseName(config_dbname);
+	QSqlDatabase dbconn = QSqlDatabase::addDatabase("QSQLITE");
+	dbconn.setDatabaseName(config_dbname);
 
-    if (!dbconn.open())
-    {
+	if (!dbconn.open())
+	{
 
-        msgBox.setText(dbconn.lastError().text());
-        msgBox.exec();
-        return false;
-    }
+		msgBox.setText(dbconn.lastError().text());
+		msgBox.exec();
+		return false;
+	}
 
-    QSqlQuery query;
+	QSqlQuery query;
 
-    query.exec("PRAGMA foreign_keys=ON;");
+	query.exec("PRAGMA foreign_keys=ON;");
 
-    if (query.lastError().isValid())
-            goto showerror;
+	if (query.lastError().isValid())
+		goto showerror;
 
-    query.exec("create table accounts \
+	query.exec("create table accounts \
                (\
                    id blob primary key, \
                    name varchar(64), \
@@ -78,10 +78,10 @@ static bool create_database()
                    ca_file varchar(255) default null \
                    );");
 
-    if (query.lastError().isValid())
-                    goto showerror;
+	if (query.lastError().isValid())
+		goto showerror;
 
-    query.exec("create table contacts \
+	query.exec("create table contacts \
                (\
                    id blob,\
                    name varchar(64), \
@@ -92,11 +92,11 @@ static bool create_database()
                    foreign key(account_id) references accounts(id) on delete cascade\
                 );");
 
-    if (query.lastError().isValid())
-            goto showerror;
+	if (query.lastError().isValid())
+		goto showerror;
 
-    query.exec(
-                "create table nodes \
+	query.exec(
+	    "create table nodes \
                 (\
                     address varchar(255) not null,\
                     port int not null,\
@@ -104,14 +104,14 @@ static bool create_database()
                     inactive_count int not null,\
                     constraint pk primary key (address,port) on conflict replace \
                  );");
-     query.exec("insert into nodes values(\"picapica.im\", 2233, 0, 0);");
-     query.exec("insert into nodes values(\"picapica.im\", 2299, 0, 0);");
-     query.exec("insert into nodes values(\"picapica.ge\", 2299, 0, 0);");
+	query.exec("insert into nodes values(\"picapica.im\", 2233, 0, 0);");
+	query.exec("insert into nodes values(\"picapica.im\", 2299, 0, 0);");
+	query.exec("insert into nodes values(\"picapica.ge\", 2299, 0, 0);");
 
-     if (query.lastError().isValid())
-             goto showerror;
+	if (query.lastError().isValid())
+		goto showerror;
 
-     query.exec("create table history \
+	query.exec("create table history \
                 (\
                     id integer primary key autoincrement, \
                     contact_id blob not null, \
@@ -122,77 +122,77 @@ static bool create_database()
                     message text(65536) not null, \
                     foreign key(account_id) references accounts(id) on delete cascade\
                 );"
-                 );
+	          );
 
-     if (query.lastError().isValid())
-             goto showerror;
+	if (query.lastError().isValid())
+		goto showerror;
 
-     query.exec("create table schema_version \
+	query.exec("create table schema_version \
                   ( \
                     ver integer primary key, \
                     timestamp int not null \
                   );"
-                );
+	          );
 
-     if (query.lastError().isValid())
-             goto showerror;
+	if (query.lastError().isValid())
+		goto showerror;
 
-	 query.exec("create table settings \
+	query.exec("create table settings \
 					( \
 						name varchar(255) not null, \
                         value varchar(255) not null, \
                         constraint pk primary key (name) on conflict replace \
 					);"
-			);
+	          );
 
-	 if (query.lastError().isValid())
-			 goto showerror;
+	if (query.lastError().isValid())
+		goto showerror;
 
-	 query.exec("insert into schema_version values (3, strftime('%s','now'));"); //current schema version. update when needed
+	query.exec("insert into schema_version values (3, strftime('%s','now'));"); //current schema version. update when needed
 
-    if (query.lastError().isValid())
-    showerror:
-    {
-        msgBox.setText(query.lastError().text());
-        msgBox.exec();
-        return false;
-    }
+	if (query.lastError().isValid())
+showerror:
+	{
+		msgBox.setText(query.lastError().text());
+		msgBox.exec();
+		return false;
+	}
 
-    return true;
+	return true;
 }
 
 static bool update_database()
 {
-    QMessageBox msgBox;
-    int schema_ver;
+	QMessageBox msgBox;
+	int schema_ver;
 
-    QSqlDatabase dbconn=QSqlDatabase::addDatabase("QSQLITE");
-    dbconn.setDatabaseName(config_dbname);
+	QSqlDatabase dbconn = QSqlDatabase::addDatabase("QSQLITE");
+	dbconn.setDatabaseName(config_dbname);
 
-    if (!dbconn.open())
-    {
+	if (!dbconn.open())
+	{
 
-        msgBox.setText(dbconn.lastError().text());
-        msgBox.exec();
-        return false;
-    }
+		msgBox.setText(dbconn.lastError().text());
+		msgBox.exec();
+		return false;
+	}
 
-    QSqlQuery query;
+	QSqlQuery query;
 
-    //checking if table schema_version exists. If not, then database belongs to pica-client before 0.5.3 version
-    query.exec("select count(*) from sqlite_master where name=\"schema_version\"");
-    query.next();
+	//checking if table schema_version exists. If not, then database belongs to pica-client before 0.5.3 version
+	query.exec("select count(*) from sqlite_master where name=\"schema_version\"");
+	query.next();
 
-    if (query.lastError().isValid())
-        goto showerror;
+	if (query.lastError().isValid())
+		goto showerror;
 
-    if (query.value(0).toInt() == 0)
-    {
-        //--------updating from pre0.5.3 pica-client database
-        msgBox.setText("Updating database to newer version");
-        msgBox.exec();
+	if (query.value(0).toInt() == 0)
+	{
+		//--------updating from pre0.5.3 pica-client database
+		msgBox.setText("Updating database to newer version");
+		msgBox.exec();
 
-        query.exec("create table history \
+		query.exec("create table history \
                    (\
                        id integer primary key autoincrement, \
                        contact_id int not null, \
@@ -203,60 +203,60 @@ static bool update_database()
                        message text(65536) not null, \
                        foreign key(account_id) references accounts(id) on delete cascade\
                    );"
-                    );
+		          );
 
-        if (query.lastError().isValid())
-                goto showerror;
+		if (query.lastError().isValid())
+			goto showerror;
 
-        query.exec("\
+		query.exec("\
                    create table schema_version \
                      ( \
                        ver integer primary key, \
                        timestamp int not null \
                      );"
-                   );
+		          );
 
-        if (query.lastError().isValid())
-                goto showerror;
+		if (query.lastError().isValid())
+			goto showerror;
 
-        query.exec("insert into schema_version values (1, strftime('%s','now'));");
-        //--------------------------------------------------
-        schema_ver = 1;
-    }
-    else
-    {
-        query.exec("select max(ver) from schema_version");
-        query.next();
+		query.exec("insert into schema_version values (1, strftime('%s','now'));");
+		//--------------------------------------------------
+		schema_ver = 1;
+	}
+	else
+	{
+		query.exec("select max(ver) from schema_version");
+		query.next();
 
-        if (query.lastError().isValid())
-                goto showerror;
+		if (query.lastError().isValid())
+			goto showerror;
 
-        schema_ver = query.value(0).toInt();
-    }
+		schema_ver = query.value(0).toInt();
+	}
 
-    if (schema_ver == 1)
-    {
-        query.exec("PRAGMA foreign_keys=OFF;");
+	if (schema_ver == 1)
+	{
+		query.exec("PRAGMA foreign_keys=OFF;");
 
-        if (query.lastError().isValid())
-            goto showerror;
+		if (query.lastError().isValid())
+			goto showerror;
 
-        query.exec("alter table accounts rename to accounts_old_schemav1;");
+		query.exec("alter table accounts rename to accounts_old_schemav1;");
 
-        if (query.lastError().isValid())
-            goto showerror;
+		if (query.lastError().isValid())
+			goto showerror;
 
-        query.exec("alter table contacts rename to contacts_old_schemav1;");
+		query.exec("alter table contacts rename to contacts_old_schemav1;");
 
-        if (query.lastError().isValid())
-            goto showerror;
+		if (query.lastError().isValid())
+			goto showerror;
 
-        query.exec("alter table history rename to history_old_schemav1;");
+		query.exec("alter table history rename to history_old_schemav1;");
 
-        if (query.lastError().isValid())
-            goto showerror;
+		if (query.lastError().isValid())
+			goto showerror;
 
-        query.exec("create table accounts \
+		query.exec("create table accounts \
                (\
                    id blob primary key, \
                    name varchar(64), \
@@ -264,12 +264,12 @@ static bool update_database()
                    pkey_file varchar(255) not null, \
                    ca_file varchar(255) default null \
                    );"
-                   );
+		          );
 
-                    if (query.lastError().isValid())
-                    goto showerror;
+		if (query.lastError().isValid())
+			goto showerror;
 
-        query.exec("create table contacts \
+		query.exec("create table contacts \
                      (\
                       id blob,\
                       name varchar(64), \
@@ -279,12 +279,12 @@ static bool update_database()
                       primary key(id, account_id),\
                       foreign key(account_id) references accounts(id) on delete cascade\
                       );"
-                      );
+		          );
 
-        if (query.lastError().isValid())
-            goto showerror;
+		if (query.lastError().isValid())
+			goto showerror;
 
-        query.exec("create table history \
+		query.exec("create table history \
                 (\
                     id integer primary key autoincrement, \
                     contact_id blob not null, \
@@ -295,96 +295,96 @@ static bool update_database()
                     message text(65536) not null, \
                     foreign key(account_id) references accounts(id) on delete cascade\
                 );"
-                 );
-        if (query.lastError().isValid())
-            goto showerror;
+		          );
+		if (query.lastError().isValid())
+			goto showerror;
 
-        query.exec("alter table accounts_old_schemav1 add column new_id blob;");
-        query.exec("alter table contacts_old_schemav1 add column new_id blob;");
+		query.exec("alter table accounts_old_schemav1 add column new_id blob;");
+		query.exec("alter table contacts_old_schemav1 add column new_id blob;");
 
-        if (query.lastError().isValid())
-            goto showerror;
+		if (query.lastError().isValid())
+			goto showerror;
 
-        query.exec("select id, cert_file from accounts_old_schemav1");
-        if (query.lastError().isValid())
-            goto showerror;
+		query.exec("select id, cert_file from accounts_old_schemav1");
+		if (query.lastError().isValid())
+			goto showerror;
 
-        while(query.next())
-        {
-            quint32 old_id;
-            QString cert_file;
-            QSqlQuery q;
-            QByteArray new_id(PICA_ID_SIZE, 0);
+		while(query.next())
+		{
+			quint32 old_id;
+			QString cert_file;
+			QSqlQuery q;
+			QByteArray new_id(PICA_ID_SIZE, 0);
 
-            old_id = query.value(0).toUInt();
-            cert_file = query.value(1).toString();
+			old_id = query.value(0).toUInt();
+			cert_file = query.value(1).toString();
 
-            if (PICA_get_id_from_cert_file(cert_file.toUtf8().constData(), (unsigned char*)new_id.data()))
-            {
-                QSqlQuery q;
+			if (PICA_get_id_from_cert_file(cert_file.toUtf8().constData(), (unsigned char*)new_id.data()))
+			{
+				QSqlQuery q;
 
-                q.prepare("update accounts_old_schemav1 set new_id = :new_id where id = :id");
-                q.bindValue(":new_id", new_id);
-                q.bindValue(":id", old_id);
-                q.exec();
-            }
-        }
+				q.prepare("update accounts_old_schemav1 set new_id = :new_id where id = :id");
+				q.bindValue(":new_id", new_id);
+				q.bindValue(":id", old_id);
+				q.exec();
+			}
+		}
 
-        query.exec("select id, cert_pem from contacts_old_schemav1");
-        if (query.lastError().isValid())
-            goto showerror;
+		query.exec("select id, cert_pem from contacts_old_schemav1");
+		if (query.lastError().isValid())
+			goto showerror;
 
-        while(query.next())
-        {
-            quint32 old_id;
-            QString cert_pem;
-            QSqlQuery q;
-            QByteArray new_id(PICA_ID_SIZE, 0);
+		while(query.next())
+		{
+			quint32 old_id;
+			QString cert_pem;
+			QSqlQuery q;
+			QByteArray new_id(PICA_ID_SIZE, 0);
 
-            old_id = query.value(0).toUInt();
-            cert_pem = query.value(1).toString();
+			old_id = query.value(0).toUInt();
+			cert_pem = query.value(1).toString();
 
-            if (PICA_get_id_from_cert_string(cert_pem.toUtf8().constData(), (unsigned char *)new_id.data()))
-            {
-                QSqlQuery q;
+			if (PICA_get_id_from_cert_string(cert_pem.toUtf8().constData(), (unsigned char *)new_id.data()))
+			{
+				QSqlQuery q;
 
-                q.prepare("update contacts_old_schemav1 set new_id = :new_id where id = :id");
-                q.bindValue(":new_id", new_id);
-                q.bindValue(":id", old_id);
-                q.exec();
-            }
-        }
+				q.prepare("update contacts_old_schemav1 set new_id = :new_id where id = :id");
+				q.bindValue(":new_id", new_id);
+				q.bindValue(":id", old_id);
+				q.exec();
+			}
+		}
 
 
-        query.exec("insert into accounts select new_id, name, cert_file, pkey_file, ca_file from accounts_old_schemav1 where new_id is not null");
+		query.exec("insert into accounts select new_id, name, cert_file, pkey_file, ca_file from accounts_old_schemav1 where new_id is not null");
 
-        if (query.lastError().isValid())
-            goto showerror;
+		if (query.lastError().isValid())
+			goto showerror;
 
-        query.exec("insert into contacts select c.new_id, c.name, c.cert_pem, a.new_id, 1 from accounts_old_schemav1 as a, contacts_old_schemav1 as c on c.account_id = a.id where c.new_id is not null and a.new_id is not null");
+		query.exec("insert into contacts select c.new_id, c.name, c.cert_pem, a.new_id, 1 from accounts_old_schemav1 as a, contacts_old_schemav1 as c on c.account_id = a.id where c.new_id is not null and a.new_id is not null");
 
-        if (query.lastError().isValid())
-            goto showerror;
+		if (query.lastError().isValid())
+			goto showerror;
 
-        query.exec("insert into history select h.id, c.new_id, a.new_id, h.timestamp, h.is_me, h.is_delivered, h.message \
+		query.exec("insert into history select h.id, c.new_id, a.new_id, h.timestamp, h.is_me, h.is_delivered, h.message \
                     from history_old_schemav1 as h, accounts_old_schemav1 as a, contacts_old_schemav1 as c on h.contact_id = c.id and h.account_id = a.id and a.id = c.account_id where c.new_id is not null and a.new_id is not null order by h.id");
 
-        if (query.lastError().isValid())
-            goto showerror;
+		if (query.lastError().isValid())
+			goto showerror;
 
-        query.exec("insert into schema_version values (2, strftime('%s','now'));");
-        schema_ver = 2;
-    }
+		query.exec("insert into schema_version values (2, strftime('%s','now'));");
+		schema_ver = 2;
+	}
 
 	if (schema_ver == 2)
 	{
-		 query.exec("create table settings \
+		query.exec("create table settings \
 					( \
 						name varchar(255) not null, \
                         value varchar(255) not null, \
                         constraint pk primary key (name) on conflict replace \
 					);"
-			);
+		          );
 
 		if (query.lastError().isValid())
 			goto showerror;
@@ -393,106 +393,106 @@ static bool update_database()
 		schema_ver = 3;
 	}
 
-if (query.lastError().isValid())
+	if (query.lastError().isValid())
 showerror:
-    {
-        msgBox.setText(query.lastError().text() + " " + query.lastQuery());
-        msgBox.exec();
-        return false;
-    }
+	{
+		msgBox.setText(query.lastError().text() + " " + query.lastQuery());
+		msgBox.exec();
+		return false;
+	}
 
-    return true;
+	return true;
 }
 
 static bool create_config_dir()
 {
-    QMessageBox msgBox;
-    config_dir=QDir::homePath()+QDir::separator() +QString(PICA_CLIENT_CONFIGDIR);
-
-    if (!QFile::exists(config_dir))
-    {
-        QDir dir;
-
-        if (!dir.mkpath(config_dir))
-        {
-            msgBox.setText(QString(QObject::tr("Unable to create configuration directory:\n %1")).arg(config_dir));
-            msgBox.exec();
-            return false;
-        }
-    }
-
-    config_dbname=config_dir+QDir::separator()+QString(PICA_CLIENT_STORAGEDB);
-
-    if (!QFile::exists(config_dbname))
-    {
-        if (!create_database())
-            return false;
-    }
-    else
-        update_database();
-
-    /*if (!QFile::exists(config_dir + QDir::separator() + PICA_CLIENT_DHPARAMFILE))
-    {
-        OpenSSLTool osslt;
-        msgBox.setText(QString(QObject::tr("Diffie-Hellman parameters will be generated. Please wait. This process can take several minutes...")));
-        msgBox.exec();
-
-        if (!osslt.GenDHParam(4096, config_dir + QDir::separator() + PICA_CLIENT_DHPARAMFILE))
-        {
-            msgBox.setText(QString(QObject::tr("Failed to generate Diffie-Hellman parameters")));
-            msgBox.exec();
-            return false;
-        }
-    }*/
-    /*
-    QString dh_error_message;
-
-    if (!DHParam::VerifyGenerated(NULL))
-    {
-        QMessageBox dhmsgBox;
-        dhmsgBox.setText(QObject::tr("Do you want to generate new Diffie-Hellman parameter file?"));
-        dhmsgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-        dhmsgBox.setDefaultButton(QMessageBox::No);
-        dhmsgBox.setInformativeText(QObject::tr("If you press \"Yes\", new Diffie-Hellman parameter generation will be started. It is a CPU intensive process and can take undetermined amount of time (1 - 20 minutes on modern computers). Default DH parameter file will be used for starting secure communications until the new DH parameter generation is finished.\nIf you press \"No\", default DH parameter file distributed with Pica Pica Messenger will be used for every communication session."));
-        switch (dhmsgBox.exec())
-        {
-        case QMessageBox::No:
-
-        DHParam::UseDefault();
-
-        break;
-
-        case QMessageBox::Yes:
-
-        DHParam::StartNewDHParamGeneration(&dh_error_message);
-
-        break;
-        }
-
-        if (!DHParam::VerifyDefault(&dh_error_message))
-        {
-            msgBox.setText(dh_error_message);
-            msgBox.setIcon(QMessageBox::Warning);
-            msgBox.setStandardButtons(QMessageBox::Ok);
-            msgBox.exec();
-        }
-    }*/
-
-    return true;
+	QMessageBox msgBox;
+	config_dir = QDir::homePath() + QDir::separator() + QString(PICA_CLIENT_CONFIGDIR);
+
+	if (!QFile::exists(config_dir))
+	{
+		QDir dir;
+
+		if (!dir.mkpath(config_dir))
+		{
+			msgBox.setText(QString(QObject::tr("Unable to create configuration directory:\n %1")).arg(config_dir));
+			msgBox.exec();
+			return false;
+		}
+	}
+
+	config_dbname = config_dir + QDir::separator() + QString(PICA_CLIENT_STORAGEDB);
+
+	if (!QFile::exists(config_dbname))
+	{
+		if (!create_database())
+			return false;
+	}
+	else
+		update_database();
+
+	/*if (!QFile::exists(config_dir + QDir::separator() + PICA_CLIENT_DHPARAMFILE))
+	{
+	    OpenSSLTool osslt;
+	    msgBox.setText(QString(QObject::tr("Diffie-Hellman parameters will be generated. Please wait. This process can take several minutes...")));
+	    msgBox.exec();
+
+	    if (!osslt.GenDHParam(4096, config_dir + QDir::separator() + PICA_CLIENT_DHPARAMFILE))
+	    {
+	        msgBox.setText(QString(QObject::tr("Failed to generate Diffie-Hellman parameters")));
+	        msgBox.exec();
+	        return false;
+	    }
+	}*/
+	/*
+	QString dh_error_message;
+
+	if (!DHParam::VerifyGenerated(NULL))
+	{
+	    QMessageBox dhmsgBox;
+	    dhmsgBox.setText(QObject::tr("Do you want to generate new Diffie-Hellman parameter file?"));
+	    dhmsgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+	    dhmsgBox.setDefaultButton(QMessageBox::No);
+	    dhmsgBox.setInformativeText(QObject::tr("If you press \"Yes\", new Diffie-Hellman parameter generation will be started. It is a CPU intensive process and can take undetermined amount of time (1 - 20 minutes on modern computers). Default DH parameter file will be used for starting secure communications until the new DH parameter generation is finished.\nIf you press \"No\", default DH parameter file distributed with Pica Pica Messenger will be used for every communication session."));
+	    switch (dhmsgBox.exec())
+	    {
+	    case QMessageBox::No:
+
+	    DHParam::UseDefault();
+
+	    break;
+
+	    case QMessageBox::Yes:
+
+	    DHParam::StartNewDHParamGeneration(&dh_error_message);
+
+	    break;
+	    }
+
+	    if (!DHParam::VerifyDefault(&dh_error_message))
+	    {
+	        msgBox.setText(dh_error_message);
+	        msgBox.setIcon(QMessageBox::Warning);
+	        msgBox.setStandardButtons(QMessageBox::Ok);
+	        msgBox.exec();
+	    }
+	}*/
+
+	return true;
 }
 
 int main(int argc, char *argv[])
 {
-    QApplication a(argc, argv);
+	QApplication a(argc, argv);
 
-    if (!create_config_dir())
-        return -1;
+	if (!create_config_dir())
+		return -1;
 #ifndef WIN32
-    picapica_ico_sit = QIcon(PICA_INSTALLPREFIX"/share/pica-client/picapica-icon-sit.png");
-    picapica_ico_fly = QIcon(PICA_INSTALLPREFIX"/share/pica-client/picapica-icon-fly.png");
+	picapica_ico_sit = QIcon(PICA_INSTALLPREFIX"/share/pica-client/picapica-icon-sit.png");
+	picapica_ico_fly = QIcon(PICA_INSTALLPREFIX"/share/pica-client/picapica-icon-fly.png");
 #else
 	picapica_ico_sit = QIcon("share\\picapica-icon-sit.png");
-    picapica_ico_fly = QIcon("share\\picapica-icon-fly.png");
+	picapica_ico_fly = QIcon("share\\picapica-icon-fly.png");
 #endif
 
 	Settings st(config_dbname);
@@ -504,30 +504,30 @@ int main(int argc, char *argv[])
 		sd.exec();
 	}
 
-    PicaActionCenter ac;
-    action_center = ∾
+	PicaActionCenter ac;
+	action_center = ∾
 
-    AccountsWindow aw;
-    accwindow = &aw;
+	AccountsWindow aw;
+	accwindow = &aw;
 
-    SkyNet s;
-    skynet=&s;
+	SkyNet s;
+	skynet = &s;
 
-    PicaSysTray pst;
-    systray = &pst;
+	PicaSysTray pst;
+	systray = &pst;
 
-    AskPassword askpsw;
-    askpassword=&askpsw;
+	AskPassword askpsw;
+	askpassword = &askpsw;
 
-    MsgUIRouter muir;
-    msguirouter = &muir;
+	MsgUIRouter muir;
+	msguirouter = &muir;
 
-    FileTransferController ftc;
-    ftctrl = &ftc;
+	FileTransferController ftc;
+	ftctrl = &ftc;
 
-    aw.show();
+	aw.show();
 
-    a.setQuitOnLastWindowClosed(false);
+	a.setQuitOnLastWindowClosed(false);
 
-    return a.exec();
+	return a.exec();
 }