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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/libkopete/ui
From:       Rafael Fernández López <ereslibre () gmail ! com>
Date:       2007-09-01 16:04:18
Message-ID: 1188662658.427803.15084.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 707351 by ereslibre:

Remove static declarations and initialization. Use 
K_GLOBAL_STATIC_WITH_ARGS from kdelibs


 M  +2 -6      kopetestdaction.cpp  
 M  +0 -2      kopetestdaction.h  


--- trunk/KDE/kdenetwork/kopete/libkopete/ui/kopetestdaction.cpp #707350:707351
@@ -30,13 +30,14 @@
 #include <kwindowsystem.h>
 #include <kcmultidialog.h>
 #include <kicon.h>
+#include <kglobal.h>
 
 #include "kopetecontactlist.h"
 #include "kopetegroup.h"
 #include "kopeteuiglobal.h"
 #include <kactioncollection.h>
 
-KSettings::Dialog *KopetePreferencesAction::s_settingsDialog = 0L;
+K_GLOBAL_STATIC_WITH_ARGS(KSettings::Dialog, s_settingsDialog, \
(Kopete::UI::Global::mainWidget()));  
 KopetePreferencesAction::KopetePreferencesAction( KActionCollection *parent, const \
char *name )  : KAction( KIcon(KStandardGuiItem::configure().iconName()), \
KStandardGuiItem::configure().text(), parent ) @@ -51,11 +52,6 @@
 
 void KopetePreferencesAction::slotShowPreferences()
 {
-	// FIXME: Use static deleter - Martijn
-	if ( !s_settingsDialog )
-	{
-		s_settingsDialog = new KSettings::Dialog( Kopete::UI::Global::mainWidget() );
-	}
 	s_settingsDialog->show();
 
 	s_settingsDialog->raise();
--- trunk/KDE/kdenetwork/kopete/libkopete/ui/kopetestdaction.h #707350:707351
@@ -119,8 +119,6 @@
 
 	  protected slots:
 			 void slotShowPreferences();
-	  private:
-			 static KSettings::Dialog *s_settingsDialog;
 };
 
 #endif


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