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 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 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 -using namespace Akregator; +namespace Akregator { class Folder::FolderPrivate { @@ -454,4 +454,6 @@ return nodeList; } +} + #include "folder.moc"