[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdehw/apps
From:       Kevin Ottens <ervin () kde ! org>
Date:       2007-07-06 19:17:39
Message-ID: 1183749459.687123.12529.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 684519 by ervin:

Port to the kdelibs API change.


 M  +3 -6      soliddatacollector/main.cpp  
 M  +3 -9      solidhardwarebrowser/main.cpp  
 M  +1 -1      solidhardwarebrowser/solidhardwarebrowser.cpp  


--- branches/work/kdehw/apps/soliddatacollector/main.cpp #684518:684519
@@ -28,16 +28,13 @@
 
 static const char version[] = "0.1";
 
-static KCmdLineOptions options[] =
-{
-    KCmdLineLastOption
-};
+static KCmdLineOptions options;
 
 int main(int argc, char **argv)
 {
     // Kapplication
-    KAboutData about("soliddatacollector", I18N_NOOP("Solid Data Collector"), \
version, description, KAboutData::License_GPL, "(C) 2007 Solid Developers", 0, 0, \
                "kde-hardware-devel@kde.org");
-    about.addAuthor( "Didier Hoarau", I18N_NOOP("Developer"), \
"did.hoarau@club-internet.fr" ); +    KAboutData about("soliddatacollector", \
"soliddatacollector", ki18n("Solid Data Collector"), version, ki18n("Solid Data \
Collector"), KAboutData::License_GPL, ki18n("(C) 2007 Solid Developers"), \
KLocalizedString(), QByteArray(), "kde-hardware-devel@kde.org"); +    \
about.addAuthor( ki18n("Didier Hoarau"), ki18n("Developer"), \
"did.hoarau@club-internet.fr" );  KCmdLineArgs::init(argc, argv, &about);
     KCmdLineArgs::addCmdLineOptions(options);
     KApplication app;
--- branches/work/kdehw/apps/solidhardwarebrowser/main.cpp #684518:684519
@@ -23,20 +23,14 @@
 
 #include "solidhardwarebrowser.h"
 
-static const char description[] =
-    I18N_NOOP("Solid Hardware Browser");
-
 static const char version[] = "0.1";
 
-static KCmdLineOptions options[] =
-{
-    KCmdLineLastOption
-};
+static KCmdLineOptions options;
 
 int main(int argc, char **argv)
 {
-    KAboutData about("solidhardwarebrowser", I18N_NOOP("Solid Hardware Browser"), \
version, description, KAboutData::License_GPL, "(C) 2006 Solid Developers", 0, 0, \
                "kde-hardware-devel@kde.org");
-    about.addAuthor( "Michaël Larouche", I18N_NOOP("Lead Developer"), \
"michael.larouche@kdemail.net" ); +    KAboutData about("solidhardwarebrowser", \
"solidhardwarebrowser", ki18n("Solid Hardware Browser"), version, ki18n("Solid \
Hardware Browser"), KAboutData::License_GPL, ki18n("(C) 2006 Solid Developers"), \
KLocalizedString(), QByteArray(), "kde-hardware-devel@kde.org"); +    \
about.addAuthor( ki18n("Michaël Larouche"), ki18n("Lead Developer"), \
"michael.larouche@kdemail.net" );  
     KCmdLineArgs::init(argc, argv, &about);
     KCmdLineArgs::addCmdLineOptions(options);
--- branches/work/kdehw/apps/solidhardwarebrowser/solidhardwarebrowser.cpp \
#684518:684519 @@ -76,7 +76,7 @@
     predicate = predicate.remove(predicate.lastIndexOf('['), 1);
     for( int i = 1; i < capabilities.size(); i++ ) predicate += " ]";
 
-    hardwareModel = new KDeviceListModel(predicate, this);
+    hardwareModel = new KDeviceListModel(/*predicate,*/ this);
     connect(hardwareModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
             this, SLOT(expandBranch(const QModelIndex&)));
     connect(hardwareModel, SIGNAL(modelInitialized()),


[prev in list] [next in list] [prev in thread] [next in thread]