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

List:       kde-commits
Subject:    branches/kdepim/enterprise/kdepim
From:       Allen Winter <winter () kde ! org>
Date:       2010-09-10 23:59:59
Message-ID: 20100911000420.26A27AC88C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1173971 by winterz:

make it compile again after the fix for kolab/issue4479
seems to still work.
Sergio: can you test it again?

MERGE: none


 M  +0 -1      akregator/src/akregator_part.h  
 M  +2 -3      kontact/plugins/akregator/akregator_plugin.cpp  
 M  +3 -5      kontact/plugins/akregator/akregator_plugin.h  


--- branches/kdepim/enterprise/kdepim/akregator/src/akregator_part.h #1173970:1173971
@@ -40,7 +40,6 @@
 class KAboutData;
 class KConfig;
 class KURL;
-class KParts::BrowserExtension;
 
 namespace Akregator
 {
--- branches/kdepim/enterprise/kdepim/kontact/plugins/akregator/akregator_plugin.cpp #1173970:1173971
@@ -75,7 +75,7 @@
 }
 
 
-AkregatorPart::AkregatorPartIface_stub *Plugin::interface()
+Akregator::AkregatorPartIface_stub *Plugin::interface()
 {
     if ( !m_stub ) {
         part();
@@ -91,8 +91,7 @@
     MyBasePart* p = loadPart();
 
     connect(p, SIGNAL(showPart()), this, SLOT(showPart()));
-    m_stub = new AkregatorPart::AkregatorPartIface_stub( dcopClient(), "akregator",
-                                      "AkregatorIface" );
+    m_stub = new Akregator::AkregatorPartIface_stub( dcopClient(), "akregator", "AkregatorIface" );
     m_stub->openStandardFeedList();
     return p;
 }
--- branches/kdepim/enterprise/kdepim/kontact/plugins/akregator/akregator_plugin.h #1173970:1173971
@@ -28,7 +28,6 @@
 #include <klocale.h>
 #include <kparts/part.h>
 
-#include <kparts/part.h>
 #include <plugin.h>
 #include "akregator_partiface_stub.h"
 #include <uniqueapphandler.h>
@@ -47,7 +46,6 @@
         virtual int newInstance();
 };
 
-
 class Plugin : public Kontact::Plugin
 {
   Q_OBJECT
@@ -59,7 +57,7 @@
 
     int weight() const { return 475; }
 
-    AkregatorPartIface_stub *interface();
+    Akregator::AkregatorPartIface_stub *interface();
 
     virtual QStringList configModules() const;
     virtual QStringList invisibleToolbarActions() const;
@@ -73,9 +71,9 @@
 
   protected:
     MyBasePart *createPart();
-    AkregatorPartIface_stub *m_stub;
+    Akregator::AkregatorPartIface_stub *m_stub;
     Kontact::UniqueAppWatcher *m_uniqueAppWatcher;
 };
 
-} // namespace Akregator
+} // namespace AkregatorPart
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]