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

List:       kde-commits
Subject:    KDE/kdepim/kontact/src
From:       David Faure <faure () kde ! org>
Date:       2009-09-29 14:13:32
Message-ID: 1254233612.177029.9955.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1029318 by dfaure:

activatePluginModule was only about the initial plugin -> renaming for clarity


 M  +2 -2      main.cpp  
 M  +8 -7      mainwindow.cpp  
 M  +3 -3      mainwindow.h  


--- trunk/KDE/kdepim/kontact/src/main.cpp #1029317:1029318
@@ -139,7 +139,7 @@
     if ( !mMainWindow ) {
       mMainWindow = new KontactInterface::MainWindow();
       if ( !moduleName.isEmpty() ) {
-        mMainWindow->setActivePluginModule( moduleName );
+        mMainWindow->setInitialActivePluginModule( moduleName );
       }
       mMainWindow->show();
       Akonadi::Control::start( mMainWindow );
@@ -151,7 +151,7 @@
       }
     } else {
       if ( !moduleName.isEmpty() ) {
-        mMainWindow->setActivePluginModule( moduleName );
+        mMainWindow->setInitialActivePluginModule( moduleName );
       }
     }
   }
--- trunk/KDE/kdepim/kontact/src/mainwindow.cpp #1029317:1029318
@@ -240,7 +240,7 @@
            this, SLOT(slotShowStatusMsg(const QString &)) );
 
   // launch commandline specified module if any
-  activatePluginModule();
+  activateInitialPluginModule();
 
   if ( Prefs::lastVersionSeen() == KGlobal::mainComponent().aboutData()->version() ) \
{  selectPlugin( mCurrentPlugin );
@@ -279,10 +279,11 @@
   }
 }
 
-void MainWindow::setActivePluginModule( const QString &module )
+// Called by main().
+void MainWindow::setInitialActivePluginModule( const QString &module )
 {
-  mActiveModule = module;
-  activatePluginModule();
+  mInitialActiveModule = module;
+  activateInitialPluginModule();
 }
 
 bool MainWindow::pluginActionWeightLessThan( const QAction *left, const QAction \
*right ) @@ -300,12 +301,12 @@
   return left->weight() < right->weight();
 }
 
-void MainWindow::activatePluginModule()
+void MainWindow::activateInitialPluginModule()
 {
-  if ( !mActiveModule.isEmpty() ) {
+  if ( !mInitialActiveModule.isEmpty() ) {
     PluginList::ConstIterator end = mPlugins.constEnd();
     for ( PluginList::ConstIterator it = mPlugins.constBegin(); it != end; ++it ) {
-      if ( ( *it )->identifier().contains( mActiveModule ) ) {
+      if ( ( *it )->identifier().contains( mInitialActiveModule ) ) {
         selectPlugin( *it );
         return;
       }
--- trunk/KDE/kdepim/kontact/src/mainwindow.h #1029317:1029318
@@ -64,7 +64,7 @@
     ~MainWindow();
 
     virtual PluginList pluginList() const { return mPlugins; }
-    void setActivePluginModule( const QString & );
+    void setInitialActivePluginModule( const QString & );
 
     static bool pluginActionWeightLessThan( const QAction *left, const QAction \
                *right );
     static bool pluginWeightLessThan( const KontactInterface::Plugin *left, const \
KontactInterface::Plugin *right ); @@ -90,7 +90,7 @@
     void slotShowIntroduction();
     void showAboutDialog();
     void slotShowStatusMsg( const QString & );
-    void activatePluginModule();
+    void activateInitialPluginModule();
     void slotOpenUrl( const KUrl &url );
 
   private:
@@ -142,7 +142,7 @@
     KSqueezedTextLabel *mStatusMsgLabel;
     KPIM::StatusbarProgressWidget *mLittleProgress;
 
-    QString mActiveModule;
+    QString mInitialActiveModule;
 
     QMap<QString, QPointer<QWidget> > mFocusWidgets;
     QMap<Plugin*, KAction*> mPluginAction;


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