Changeset 6085

Timestamp:

03/04/08 04:38:04 (9 months ago)

Author:

flynd

Message:

Kde4-gui doesn't allow setting style so hide the command line option.

Location:

trunk/qt4-gui/src/core

Files:

• licqgui.cpp (modified) (7 diffs)
• plugin.cpp (modified) (3 diffs)

trunk/qt4-gui/src/core/licqgui.cpp

@@ -33 +33 @@
 #include <QLocale>
 #include <QSessionManager>
-#include <QStyle>
-#include <QStyleFactory>
 #include <QTranslator>
 
@@ -41 +39 @@
 #include <KDE/KToolInvocation>
 #include <KDE/KUrl>
+#else
+# include <QStyle>
+# include <QStyleFactory>
 #endif
 
@@ -150 +151 @@
   myInstance = this;
 
+#ifndef USE_KDE
   char styleName[32] = "";
+#endif
   int i = 1;
 
@@ -162 +165 @@
 
   // parse command line for arguments
+#ifdef USE_KDE
+  while ((i = getopt(argc, argv, "hs:i:e:dD")) > 0)
+#else
   while ((i = getopt(argc, argv, "hs:i:e:g:dD")) > 0)
+#endif
   {
     switch (i)
@@ -178 +185 @@
         break;
 
+#ifndef USE_KDE
       case 'g':   // gui style
         strncpy(styleName, optarg, sizeof(styleName));
         styleName[sizeof(styleName) - 1] = '\0';
         break;
+#endif
 
       case 'd':   // dock icon
@@ -635 +644 @@
 #endif /* defined(Q_WS_X11) */
 
+#ifndef USE_KDE
 QStyle* LicqGui::createStyle(const char* name)
 {
@@ -645 +655 @@
   return s;
 }
+#endif
 
 void LicqGui::changeStatus(unsigned long status, bool invisible)

trunk/qt4-gui/src/core/plugin.cpp

@@ -60 +60 @@
 {
   static QString usage = QString(
-    "Usage:  Licq [options] -p %1 -- [-hdD] [-s skinname] [-i iconpack] [-e extendediconpack] [-g guistyle]\n"
+    "Usage:  Licq [options] -p %1 -- [-hdD] [-s skinname] [-i iconpack] [-e extendediconpack]"
+#ifndef USE_KDE
+    " [-g guistyle]"
+#endif
+    "\n"
     " -h : this help screen\n"
     " -d : start hidden (dock icon only)\n"
@@ -66 +70 @@
     " -s : set the skin to use (must be in %2%3%4)\n"
     " -i : set the icons to use (must be in %2%3%5)\n"
-    " -e : set the extended icons to use (must be in %2%3%6)\n"
-    " -g : set the gui style (%7, or 'default' to follow global Qt settings), ignored by KDE support")
+    " -e : set the extended icons to use (must be in %2%3%6)"
+#ifndef USE_KDE
+    "\n -g : set the gui style (%7, or 'default' to follow global Qt settings), ignored by KDE support"
+#endif
+    )
     .arg(PLUGIN_NAME)
     .arg(BASE_DIR)
@@ -74 +81 @@
     .arg(ICONS_DIR)
     .arg(EXTICONS_DIR)
-    .arg(QStyleFactory::keys().join(" | "));
+#ifndef USE_KDE
+    .arg(QStyleFactory::keys().join(" | "))
+#endif
+    ;
 
   return usage.toLatin1().constData();