Qt4 port step 5: type safety

Fix various type check errors.

4 files changed, 10 insertions, 9 deletions

diff --git a/src/gui/freedesksystray.cpp b/src/gui/freedesksystray.cpp
index 4dfddd4..2c75d6f 100644
--- a/src/gui/freedesksystray.cpp
+++ b/src/gui/freedesksystray.cpp
@@ -28,7 +28,8 @@
 #include <Q3PopupMenu>
 
 FreeDeskSysTray::FreeDeskSysTray ( QWidget *pParent , const char *pszName )
-    : QLabel(pParent, pszName, WMouseNoMask | WRepaintNoErase | WType_TopLevel | WStyle_Customize | WStyle_NoBorder | WStyle_StaysOnTop)
+    : QLabel(pParent, pszName, Qt::WMouseNoMask | Qt::WRepaintNoErase | Qt::WType_TopLevel |
+                               Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop)
 {
   mainWindow = pParent;
   trayMenu = new Q3PopupMenu(this);
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 4c323b4..4ba3917 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -826,7 +826,7 @@ void t_gui::restore_session_state(void) {
 	
 	t_win_geometry geometry = sys_config->get_ui_session_main_geometry();
 	mainWindow->setGeometry(geometry.x, geometry.y, geometry.width, geometry.height);
-	mainWindow->setWindowState(sys_config->get_ui_session_main_state());
+	mainWindow->setWindowState(Qt::WindowStates(sys_config->get_ui_session_main_state()));
 	mainWindow->setHidden(sys_config->get_ui_session_main_hidden());
 	
 	unlock();
@@ -2474,7 +2474,7 @@ bool t_gui::cb_message_request(t_user *user_config, t_request *r) {
 			// Try to decode the text
 			QTextCodec *c = QTextCodec::codecForName(charset.c_str());
 			if (c) {
-				text = c->toUnicode(text.c_str());
+				text = c->toUnicode(text.c_str()).ascii();
 			} else {
 				log_file->write_header(
 						"t_gui::cb_message_request",
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index e64572d..81ba28f 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -288,7 +288,7 @@ void parse_main_args(int argc, char **argv, bool &cli_mode, bool &override_lock_
 		} else if (strcmp(argv[i], "--version") == 0) {
 			// Get version
 			QString s = sys_config->about(false).c_str();
-			cout << s;
+			cout << s.ascii();
 			exit(0);
 		} else if (strcmp(argv[i], "-c") == 0) {
 			// CLI mode
@@ -775,15 +775,15 @@ int main( int argc, char ** argv )
 					if (cli_mode) {
 						error_msg += QString("You can only run multiple profiles for different users.").ascii();
 						error_msg += "\n";
-						error_msg += QString("If these are users for different domains, then enable the following option in your user profile (SIP protocol):");
+						error_msg += QString("If these are users for different domains, then enable the following option in your user profile (SIP protocol):").ascii();
 						error_msg += "\n";
-						error_msg += QString("Use domain name to create a unique contact header");
+						error_msg += QString("Use domain name to create a unique contact header").ascii();
 					} else {
 						error_msg += qApp->translate("GUI", "You can only run multiple profiles for different users.").ascii();
 						error_msg += "\n";
-						error_msg += qApp->translate("GUI", "If these are users for different domains, then enable the following option in your user profile (SIP protocol)");
+						error_msg += qApp->translate("GUI", "If these are users for different domains, then enable the following option in your user profile (SIP protocol)").ascii();
 						error_msg += ":\n";
-						error_msg += qApp->translate("GUI", "Use domain name to create a unique contact header");
+						error_msg += qApp->translate("GUI", "Use domain name to create a unique contact header").ascii();
 					}
 					ui->cb_show_msg(error_msg, MSG_CRITICAL);
 					profile_selected = false;
diff --git a/src/gui/mphoneform.ui.h b/src/gui/mphoneform.ui.h
index 21ff362..e68a244 100644
--- a/src/gui/mphoneform.ui.h
+++ b/src/gui/mphoneform.ui.h
@@ -2383,7 +2383,7 @@ void MphoneForm::newUsers(const list<string> &profiles)
 				error_msg += "\n";
 				error_msg += dup_user->get_profile_name();
 				error_msg += "\n\n";
-				error_msg += tr("You can only run multiple profiles for different users.");
+				error_msg += tr("You can only run multiple profiles for different users.").ascii();
 				
 				log_file->write_report(error_msg,
 					"MphoneForm::newUsers",