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

List:       kde-pim
Subject:    [Kde-pim] Re: akregatorpart 4.4.9 fails to build
From:       Erik <esigra () gmail ! com>
Date:       2011-01-02 11:53:22
Message-ID: 4D206732.9050405 () home ! se
[Download RAW message or body]

2011-01-02 12:25, Erik skrev:
> The attached patch fixes this build error and other simlar so that the 
> target can be built.

That did not work so well in non-final mode. See this patch instead:

["kdepim-4.4.9-akregatorpart_namespace_fix-2.diff" (text/plain)]

diff -ru orig/kdepim-4.4.9/akregator/src/deletesubscriptioncommand.cpp \
                kdepim-4.4.9/akregator/src/deletesubscriptioncommand.cpp
--- orig/kdepim-4.4.9/akregator/src/deletesubscriptioncommand.cpp
+++ kdepim-4.4.9/akregator/src/deletesubscriptioncommand.cpp
@@ -66,7 +66,7 @@
             return true;
         }

-        virtual bool visitFeed(Feed* node)
+        virtual bool visitFeed(Akregator::Feed* node)
         {
             QString msg;
             if (node->title().isEmpty())
diff -ru orig/kdepim-4.4.9/akregator/src/editsubscriptioncommand.cpp \
                kdepim-4.4.9/akregator/src/editsubscriptioncommand.cpp
--- orig/kdepim-4.4.9/akregator/src/editsubscriptioncommand.cpp
+++ kdepim-4.4.9/akregator/src/editsubscriptioncommand.cpp
@@ -51,7 +51,7 @@
         return true;
     }
 
-    bool visitFeed(Feed* node)
+    bool visitFeed(Akregator::Feed* node)
     {
         QPointer<FeedPropertiesDialog> dlg = new FeedPropertiesDialog( m_widget );
         dlg->setFeed(node);
diff -ru orig/kdepim-4.4.9/akregator/src/feed.cpp kdepim-4.4.9/akregator/src/feed.cpp
--- orig/kdepim-4.4.9/akregator/src/feed.cpp
+++ kdepim-4.4.9/akregator/src/feed.cpp
@@ -61,9 +61,10 @@
 #include <memory>

 using Syndication::ItemPtr;
-using namespace Akregator;
 using namespace boost;

+namespace Akregator {
+
 class Feed::Private
 {
         Feed* const q;
@@ -883,5 +884,7 @@
     }
 }

+}
+
 #include "feed.moc"

diff -ru orig/kdepim-4.4.9/akregator/src/folder.cpp \
                kdepim-4.4.9/akregator/src/folder.cpp
--- orig/kdepim-4.4.9/akregator/src/folder.cpp
+++ kdepim-4.4.9/akregator/src/folder.cpp
@@ -37,7 +37,7 @@

 #include <cassert>

-using namespace Akregator;
+namespace Akregator {

 class Folder::FolderPrivate
 {
@@ -454,4 +454,6 @@
     return nodeList;
 }

+}
+
 #include "folder.moc"



_______________________________________________
KDE PIM mailing list kde-pim@kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/

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