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

List:       kde-commits
Subject:    [kdepim/akregator_port] /: Move FeedListView from krss to Akregator.
From:       Frank Osterfeld <frank.osterfeld () kdab ! com>
Date:       2012-02-24 15:27:00
Message-ID: 20120224152700.01760A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 87b21c1b45339c99bdaa7c2ac1ae883aef6ebcec by Frank Osterfeld.
Committed on 24/02/2012 at 16:19.
Pushed by osterfeld into branch 'akregator_port'.

Move FeedListView from krss to Akregator.

M  +1    -0    akregator2/src/CMakeLists.txt
M  +1    -1    akregator2/src/actionmanagerimpl.cpp
M  +1    -1    akregator2/src/createtagcommand.cpp
R  +0    -0    akregator2/src/feedlistview.cpp [from: krss/krss/ui/feedlist=
view.cpp - 100% similarity]
R  +1    -2    akregator2/src/feedlistview.h [from: krss/krss/ui/feedlistvi=
ew.h - 095% similarity]
M  +1    -1    akregator2/src/mainwidget.cpp
M  +0    -3    krss/krss/CMakeLists.txt

http://commits.kde.org/kdepim/87b21c1b45339c99bdaa7c2ac1ae883aef6ebcec

diff --git a/akregator2/src/CMakeLists.txt b/akregator2/src/CMakeLists.txt
index 1893612..387914f 100644
--- a/akregator2/src/CMakeLists.txt
+++ b/akregator2/src/CMakeLists.txt
@@ -61,6 +61,7 @@ set(akregator2part_PART_SRCS
    command_p.cpp
 #   deletesubscriptioncommand.cpp
    feediconmanager.cpp
+   feedlistview.cpp
    pluginmanager.cpp
    selectioncontroller.cpp
    utils.cpp
diff --git a/akregator2/src/actionmanagerimpl.cpp b/akregator2/src/actionma=
nagerimpl.cpp
index d1d0141..cd9dff3 100644
--- a/akregator2/src/actionmanagerimpl.cpp
+++ b/akregator2/src/actionmanagerimpl.cpp
@@ -32,11 +32,11 @@
 #include "speechclient.h"
 #include "tabwidget.h"
 #include "trayicon.h"
+#include "feedlistview.h"
 =

 #include <Akonadi/Collection>
 =

 #include <krss/feedcollection.h>
-#include <krss/ui/feedlistview.h>
 =

 #include <kactionmenu.h>
 #include <ktoolbarpopupaction.h>
diff --git a/akregator2/src/createtagcommand.cpp b/akregator2/src/createtag=
command.cpp
index 46e769d..a51cf59 100644
--- a/akregator2/src/createtagcommand.cpp
+++ b/akregator2/src/createtagcommand.cpp
@@ -24,6 +24,7 @@
 =

 #include "createtagcommand.h"
 #include "command_p.h"
+#include "feedlistview.h"
 =

 #include <Akonadi/Collection>
 #include <Akonadi/CollectionCreateJob>
@@ -33,7 +34,6 @@
 =

 #include <krss/feedcollection.h>
 #include <krss/item.h>
-#include <krss/ui/feedlistview.h>
 =

 #include <KLocalizedString>
 =

diff --git a/krss/krss/ui/feedlistview.cpp b/akregator2/src/feedlistview.cpp
similarity index 100%
rename from krss/krss/ui/feedlistview.cpp
rename to akregator2/src/feedlistview.cpp
diff --git a/krss/krss/ui/feedlistview.h b/akregator2/src/feedlistview.h
similarity index 95%
rename from krss/krss/ui/feedlistview.h
rename to akregator2/src/feedlistview.h
index cb0c19f..5dd2019 100644
--- a/krss/krss/ui/feedlistview.h
+++ b/akregator2/src/feedlistview.h
@@ -19,7 +19,6 @@
 #ifndef KRSS_FEEDLISTVIEW_H
 #define KRSS_FEEDLISTVIEW_H
 =

-#include "krss/krss_export.h"
 =

 #include <Akonadi/EntityTreeView>
 =

@@ -32,7 +31,7 @@ namespace Akonadi {
 }
 namespace KRss {
 =

-class KRSS_EXPORT FeedListView : public Akonadi::EntityTreeView
+class FeedListView : public Akonadi::EntityTreeView
 {
     Q_OBJECT
 =

diff --git a/akregator2/src/mainwidget.cpp b/akregator2/src/mainwidget.cpp
index f4da05d..0f4359a 100644
--- a/akregator2/src/mainwidget.cpp
+++ b/akregator2/src/mainwidget.cpp
@@ -37,6 +37,7 @@
 #include "modifycommands.h"
 #include "deletesubscriptioncommand.h"
 #include "editfeedcommand.h"
+#include "feedlistview.h"
 #include "importfeedlistcommand.h"
 #include "exportfeedlistcommand.h"
 #include "framemanager.h"
@@ -60,7 +61,6 @@
 =

 #include <krss/feedcollection.h>
 #include <krss/item.h>
-#include <krss/ui/feedlistview.h>
 =

 #include <solid/networking.h>
 =

diff --git a/krss/krss/CMakeLists.txt b/krss/krss/CMakeLists.txt
index c6aade7..5395d84 100644
--- a/krss/krss/CMakeLists.txt
+++ b/krss/krss/CMakeLists.txt
@@ -23,7 +23,6 @@ set(krss_LIB_SRCS
    helper.cpp
    feeditemmodel.cpp
 # ui stuff
-   ui/feedlistview.cpp
    ui/feedpropertiesdialog.cpp
 )
 =

@@ -70,8 +69,6 @@ set(krss_LIB_HDRS
 )
 =

 set(krss_UI_LIB_HDRS
-   ui/feedlistview.h
-   ui/netfeedcreatedialog.h
    ui/feedpropertiesdialog.h
 )
 =


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