From kde-pim  Sun Jan 02 11:25:52 2011
From: Erik <esigra () gmail ! com>
Date: Sun, 02 Jan 2011 11:25:52 +0000
To: kde-pim
Subject: [Kde-pim]  akregatorpart 4.4.9 fails to build
Message-Id: <4D2060C0.3070002 () gmail ! com>
X-MARC-Message: https://marc.info/?l=kde-pim&m=129396741111600
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--------------020403060808010906080902"

This is a multi-part message in MIME format.
--------------020403060808010906080902
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 8bit

Steps to reproduce:
1. tar jxvf kdepim-4.4.9.tar.bz2
2. cd kdepim-4.4.9
3. mkdir build
4. cd build
5. cmake -DKDE4_ENABLE_FINAL=ON ..
6. make akregatorpart

Actual results:
In file included from 
/home/work/programmering/kdepim-4.4.9/build/akregator/src/akregatorpart_final_cpp.cpp:8:
/home/work/programmering/kdepim-4.4.9/akregator/src/deletesubscriptioncommand.cpp: 
At global scope:
/home/work/programmering/kdepim-4.4.9/akregator/src/deletesubscriptioncommand.cpp:69: 
fel: referens till "Feed" är tvetydig
/usr/include/syndication/feed.h:66: fel: candidates are: class 
Syndication::Feed
/home/work/programmering/kdepim-4.4.9/akregator/src/feed.h:53: 
fel:                 class Akregator::Feed
/home/work/programmering/kdepim-4.4.9/akregator/src/deletesubscriptioncommand.cpp:69: 
fel: referens till "Feed" är tvetydig
/usr/include/syndication/feed.h:66: fel: candidates are: class 
Syndication::Feed
/home/work/programmering/kdepim-4.4.9/akregator/src/feed.h:53: 
fel:                 class Akregator::Feed
/home/work/programmering/kdepim-4.4.9/akregator/src/deletesubscriptioncommand.cpp:69: 
fel: "Feed" har inte deklarerats

The attached patch fixes this build error and other simlar so that the 
target can be built. It only fixes the parts that are needed for the 
build, although similar fixes should be made to the rest of the source 
files.

--------------020403060808010906080902
Content-Type: text/plain;
 name="kdepim-4.4.9-akregatorpart_namespace_fix-1.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="kdepim-4.4.9-akregatorpart_namespace_fix-1.diff"

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
@@ -36,10 +36,9 @@
 #include <QPointer>
 #include <QTimer>
 
-using namespace Akregator;
 using namespace boost;
 
-namespace {
+namespace Akregator {
 
 class DeleteNodeVisitor : public TreeNodeVisitor
 {
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
@@ -35,10 +35,9 @@
 
 #include <cassert>
 
-using namespace Akregator;
 using namespace boost;
 
-namespace {
+namespace Akregator {
 
 class EditNodePropertiesVisitor : public TreeNodeVisitor
 {
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"

--------------020403060808010906080902
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
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/
--------------020403060808010906080902--