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

List:       kde-commits
Subject:    [kdepim/akregator_port] akregator2/src: Partially apply 6645c7df to akregator2
From:       Christophe Giboudeaux <cgiboudeaux () gmx ! com>
Date:       2013-06-03 16:53:14
Message-ID: 20130603165314.C2D6BA6067 () git ! kde ! org
[Download RAW message or body]

Git commit 1eeff3c9cd99b94cb8d6896aa34eb70a2f5eed83 by Christophe Giboudeau=
x.
Committed on 03/06/2013 at 18:52.
Pushed by cgiboudeaux into branch 'akregator_port'.

Partially apply 6645c7df to akregator2

M  +1    -0    akregator2/src/CMakeLists.txt
M  +1    -1    akregator2/src/actionmanagerimpl.cpp
M  +1    -1    akregator2/src/frame.cpp
M  +1    -1    akregator2/src/kernel.cpp
M  +1    -1    akregator2/src/mainwidget.cpp
M  +2    -2    akregator2/src/mainwindow.cpp

http://commits.kde.org/kdepim/1eeff3c9cd99b94cb8d6896aa34eb70a2f5eed83

diff --git a/akregator2/src/CMakeLists.txt b/akregator2/src/CMakeLists.txt
index e90afd0..9eabca2 100644
--- a/akregator2/src/CMakeLists.txt
+++ b/akregator2/src/CMakeLists.txt
@@ -9,6 +9,7 @@ include_directories (
     ${Boost_INCLUDE_DIR}
     ${CMAKE_SOURCE_DIR}/akregator2/interfaces
     ${CMAKE_BINARY_DIR}/akregator2/interfaces
+    ${CMAKE_SOURCE_DIR}/libkdepim
     ${NEPOMUK_CORE_INCLUDE_DIR}
     )
 =

diff --git a/akregator2/src/actionmanagerimpl.cpp b/akregator2/src/actionma=
nagerimpl.cpp
index 589eab5..37820d7 100644
--- a/akregator2/src/actionmanagerimpl.cpp
+++ b/akregator2/src/actionmanagerimpl.cpp
@@ -56,7 +56,7 @@
 #include <QWidget>
 #include <QApplication>
 =

-#include <libkdepim/progressmanager.h>
+#include <libkdepim/progresswidget/progressmanager.h>
 =

 #include <boost/shared_ptr.hpp>
 =

diff --git a/akregator2/src/frame.cpp b/akregator2/src/frame.cpp
index a4015f1..1ae21c0 100644
--- a/akregator2/src/frame.cpp
+++ b/akregator2/src/frame.cpp
@@ -34,7 +34,7 @@
 #include <kparts/browserextension.h>
 #include <kparts/part.h>
 =

-#include <libkdepim/progressmanager.h>
+#include <libkdepim/progresswidget/progressmanager.h>
 =

 namespace Akregator2 {
 =

diff --git a/akregator2/src/kernel.cpp b/akregator2/src/kernel.cpp
index 9b451af..778b900 100644
--- a/akregator2/src/kernel.cpp
+++ b/akregator2/src/kernel.cpp
@@ -25,7 +25,7 @@
 #include "kernel.h"
 =

 #include "framemanager.h"
-#include <libkdepim/progressmanager.h>
+#include <libkdepim/progresswidget/progressmanager.h>
 =

 #include <QPointer>
 #include <QStringList>
diff --git a/akregator2/src/mainwidget.cpp b/akregator2/src/mainwidget.cpp
index 7ed7ba1..23d64db 100644
--- a/akregator2/src/mainwidget.cpp
+++ b/akregator2/src/mainwidget.cpp
@@ -43,7 +43,7 @@
 #include "framemanager.h"
 #include "kernel.h"
 #include "openurlrequest.h"
-#include <libkdepim/progressmanager.h>
+#include <libkdepim/progresswidget/progressmanager.h>
 =

 #include "searchbar.h"
 #include "selectioncontroller.h"
diff --git a/akregator2/src/mainwindow.cpp b/akregator2/src/mainwindow.cpp
index 932a7bd..b68c4ed 100644
--- a/akregator2/src/mainwindow.cpp
+++ b/akregator2/src/mainwindow.cpp
@@ -27,8 +27,8 @@
 #include "akregator2config.h"
 #include "trayicon.h"
 =

-#include <libkdepim/progressdialog.h>
-#include <libkdepim/statusbarprogresswidget.h>
+#include <libkdepim/progresswidget/progressdialog.h>
+#include <libkdepim/progresswidget/statusbarprogresswidget.h>
 #include <libkdepim/broadcaststatus.h>
 =

 #include <KAction>
[prev in list] [next in list] [prev in thread] [next in thread]