Changeset 5888 for branches/qt-gui_qt4/src/core/licqgui.cpp

Timestamp:

11/28/07 09:26:58 (12 months ago)

Author:

eugene

Message:

• Rectified most paths;
• Moved gui config file into QTGUI_DIR and named config.ini in order to let advanced editors apply their syntax rules;
• Tiny CodingStyle update.

Files:

• branches/qt-gui_qt4/src/core/licqgui.cpp (modified) (7 diffs)

branches/qt-gui_qt4/src/core/licqgui.cpp

@@ -121 +121 @@
   // We need to catch that here and tell the Xlib that we
   // ignore it, otherwise Qt's handler will terminate us. :-(
-  if(err->error_code == BadDrawable)
+  if (err->error_code == BadDrawable)
     return 0;
 
@@ -191 +191 @@
   char* ptr;
   char buf[MAX_FILENAME_LEN];
-  snprintf(buf, MAX_FILENAME_LEN, "%s/licq_qt-gui.style", BASE_DIR);
+  snprintf(buf, MAX_FILENAME_LEN, "%s%sstyle.ini", BASE_DIR, QTGUI_DIR);
   buf[MAX_FILENAME_LEN - 1] = '\0';
 
@@ -265 +265 @@
 
   gLog.Info("%s%s configuration.\n", L_INITxSTR, PLUGIN_NAME);
-  snprintf(szTemp, MAX_FILENAME_LEN, "%s/%s", BASE_DIR, QTGUI_CONFIGFILE);
+  snprintf(szTemp, MAX_FILENAME_LEN, "%s%s", BASE_DIR, QTGUI_CONFIGFILE);
   szTemp[MAX_FILENAME_LEN - 1] = '\0';
   CIniFile licqConf;
   if (!licqConf.LoadFile(szTemp))
   {
-    // File doesn't exist so define sections and write them now so saving won't generate warnings later
+    // File doesn't exist so define sections and write them now
+    // so saving won't generate warnings later
     licqConf.SetFlags(INI_FxALLOWxCREATE);
     licqConf.ReloadFile();
@@ -308 +309 @@
   licqConf.ReadStr("Emoticons", szTemp, Emoticons::DEFAULT_THEME.toLatin1());
   QStringList emoticonsDirs;
-  emoticonsDirs += QString::fromLatin1(SHARE_DIR) + QTGUI_DIR + EMOTICONS_DIR;
-  emoticonsDirs += QString::fromLatin1(BASE_DIR) + QTGUI_DIR + EMOTICONS_DIR;
+  emoticonsDirs += QString::fromLocal8Bit(SHARE_DIR) + QTGUI_DIR + EMOTICONS_DIR;
+  emoticonsDirs += QString::fromLocal8Bit(BASE_DIR) + QTGUI_DIR + EMOTICONS_DIR;
 #ifdef USE_KDE
   // emoticons resource added in KDE 3.4
@@ -352 +353 @@
 {
   char szTemp[MAX_FILENAME_LEN];
-  snprintf(szTemp, MAX_FILENAME_LEN, "%s/%s", BASE_DIR, QTGUI_CONFIGFILE);
+  snprintf(szTemp, MAX_FILENAME_LEN, "%s%s", BASE_DIR, QTGUI_CONFIGFILE);
   szTemp[MAX_FILENAME_LEN - 1] = '\0';
   CIniFile licqConf;
@@ -387 +388 @@
   // Save all our options
   char filename[MAX_FILENAME_LEN];
-  snprintf(filename, MAX_FILENAME_LEN, "%s/%s", BASE_DIR, QTGUI_CONFIGFILE);
+  snprintf(filename, MAX_FILENAME_LEN, "%s%s", BASE_DIR, QTGUI_CONFIGFILE);
   filename[MAX_FILENAME_LEN - 1] = '\0';
   CIniFile licqConf(INI_FxERROR | INI_FxALLOWxCREATE);
-  if (!licqConf.LoadFile(filename)) return;
+
+  if (!licqConf.LoadFile(filename))
+    return;
 
   Config::General::instance()->saveConfiguration(licqConf);
@@ -1072 +1075 @@
   {
     if (!myLicqDaemon->ViewUrl(url.toLocal8Bit().data()))
-      WarnUser(parent, tr("Licq is unable to start your browser and open the URL.\nYou will need to start the browser and open the URL manually."));
+      WarnUser(parent,
+          tr("Licq is unable to start your browser and open the URL.\n"
+            "You will need to start the browser and open the URL manually."));
   }
 }