blob: de134168c5c2f6a4cb74d39e4a25dd98d51fe6ed (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
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"
|
GitWeb
