diff options
Diffstat (limited to 'akregator')
-rw-r--r-- | akregator/src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | akregator/src/Makefile.am | 2 | ||||
-rw-r--r-- | akregator/src/akregator_part.cpp | 8 | ||||
-rw-r--r-- | akregator/src/akregator_part.h | 4 | ||||
-rw-r--r-- | akregator/src/akregator_run.h | 2 | ||||
-rw-r--r-- | akregator/src/akregator_view.cpp | 6 | ||||
-rw-r--r-- | akregator/src/articleviewer.cpp | 2 | ||||
-rw-r--r-- | akregator/src/feedlistview.cpp | 2 | ||||
-rw-r--r-- | akregator/src/frame.cpp | 4 | ||||
-rw-r--r-- | akregator/src/listtabwidget.cpp | 2 | ||||
-rw-r--r-- | akregator/src/mainwindow.cpp | 4 | ||||
-rw-r--r-- | akregator/src/mainwindow.h | 6 | ||||
-rw-r--r-- | akregator/src/pageviewer.cpp | 6 | ||||
-rw-r--r-- | akregator/src/tabwidget.cpp | 4 | ||||
-rw-r--r-- | akregator/src/viewer.cpp | 4 | ||||
-rw-r--r-- | akregator/src/viewer.h | 2 |
16 files changed, 31 insertions, 31 deletions
diff --git a/akregator/src/CMakeLists.txt b/akregator/src/CMakeLists.txt index 2a154391..621880eb 100644 --- a/akregator/src/CMakeLists.txt +++ b/akregator/src/CMakeLists.txt @@ -92,7 +92,7 @@ tde_add_library( akregatorprivate SHARED AUTOMOC tde_add_executable( akregator AUTOMOC SOURCES main.cpp mainwindow.cpp - LINK akregatorprivate-shared tdepim-shared kparts-shared + LINK akregatorprivate-shared tdepim-shared tdeparts-shared DESTINATION ${BIN_INSTALL_DIR} ) @@ -117,6 +117,6 @@ tde_add_kpart( libakregatorpart AUTOMOC tagpropertieswidgetbase.ui treenodeitem.cpp viewer.cpp ${TDE_INCLUDE_DIR}/kspeechsink.skel ${TDE_INCLUDE_DIR}/kspeech.stub listtabwidget.cpp - LINK akregatorprivate-shared tdepim-shared khtml-shared + LINK akregatorprivate-shared tdepim-shared tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/akregator/src/Makefile.am b/akregator/src/Makefile.am index 5cfde7d3..e212b260 100644 --- a/akregator/src/Makefile.am +++ b/akregator/src/Makefile.am @@ -20,7 +20,7 @@ bin_PROGRAMS = akregator # the application source, library search path, and link libraries akregator_SOURCES = main.cpp mainwindow.cpp -akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la #akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index 41632adb..3ea4e798 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -32,7 +32,7 @@ #include <kconfigdialog.h> #include <kfiledialog.h> #include <kglobalsettings.h> -#include <khtmldefaults.h> +#include <tdehtmldefaults.h> #include <kinstance.h> #include <kmainwindow.h> #include <kmessagebox.h> @@ -45,9 +45,9 @@ #include <ktempfile.h> #include <ktrader.h> #include <kio/netaccess.h> -#include <kparts/browserinterface.h> -#include <kparts/genericfactory.h> -#include <kparts/partmanager.h> +#include <tdeparts/browserinterface.h> +#include <tdeparts/genericfactory.h> +#include <tdeparts/partmanager.h> #include <tqfile.h> #include <tqobjectlist.h> diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h index 68062a0c..1e17c05f 100644 --- a/akregator/src/akregator_part.h +++ b/akregator/src/akregator_part.h @@ -26,8 +26,8 @@ #ifndef _AKREGATORPART_H_ #define _AKREGATORPART_H_ -#include <kparts/browserextension.h> -#include <kparts/part.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/part.h> #include <kurl.h> #include "config.h" diff --git a/akregator/src/akregator_run.h b/akregator/src/akregator_run.h index 6f8308b9..e819dc13 100644 --- a/akregator/src/akregator_run.h +++ b/akregator/src/akregator_run.h @@ -25,7 +25,7 @@ #ifndef AKREGATOR_RUN_H #define AKREGATOR_RUN_H -#include <kparts/browserrun.h> +#include <tdeparts/browserrun.h> namespace Akregator { diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index e1ed5a1d..3066760a 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -67,8 +67,8 @@ #include <kdialog.h> #include <kfiledialog.h> #include <kfileitem.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> #include <kiconloader.h> #include <kinputdialog.h> #include <klineedit.h> @@ -82,7 +82,7 @@ #include <kstandarddirs.h> #include <kurl.h> #include <kxmlguifactory.h> -#include <kparts/partmanager.h> +#include <tdeparts/partmanager.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index 32d931f8..dfd48ffe 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -31,7 +31,7 @@ #include <kapplication.h> #include <kdebug.h> #include <kglobalsettings.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <klocale.h> #include <kprocess.h> #include <krun.h> diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp index 8998882f..117d94c0 100644 --- a/akregator/src/feedlistview.cpp +++ b/akregator/src/feedlistview.cpp @@ -43,7 +43,7 @@ #include <kiconeffect.h> #include <kiconloader.h> #include <klocale.h> -#include <kmultipledrag.h> +#include <tdemultipledrag.h> #include <kstringhandler.h> #include <kurldrag.h> diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index 14b32522..8f1a6512 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -28,8 +28,8 @@ #include <kactioncollection.h> #include <kdebug.h> #include <klocale.h> -#include <kparts/browserextension.h> -#include <kparts/part.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/part.h> #include <libtdepim/progressmanager.h> diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp index f071cd95..1920a5ff 100644 --- a/akregator/src/listtabwidget.cpp +++ b/akregator/src/listtabwidget.cpp @@ -27,7 +27,7 @@ #include "folder.h" #include "treenode.h" -#include <kmultitabbar.h> +#include <tdemultitabbar.h> #include <tqiconset.h> #include <tqlayout.h> diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index 3e520842..f6e5ec18 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -41,7 +41,7 @@ #include <klibloader.h> #include <klocale.h> #include <kmessagebox.h> -#include <kparts/partmanager.h> +#include <tdeparts/partmanager.h> #include <ksqueezedtextlabel.h> #include <kstandarddirs.h> #include <kstatusbar.h> @@ -237,7 +237,7 @@ bool MainWindow::queryExit() kdDebug() << "MainWindow::queryExit()" << endl; if ( !kapp->sessionSaving() ) { - delete m_part; // delete that here instead of dtor to ensure nested khtmlparts are deleted before singleton objects like KHTMLPageCache + delete m_part; // delete that here instead of dtor to ensure nested tdehtmlparts are deleted before singleton objects like KHTMLPageCache m_part = 0; } else diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h index c7321dbd..bb3ca733 100644 --- a/akregator/src/mainwindow.h +++ b/akregator/src/mainwindow.h @@ -30,9 +30,9 @@ #endif #include <kapplication.h> -#include <kparts/mainwindow.h> -#include <kparts/browserinterface.h> -#include <kparts/browserextension.h> +#include <tdeparts/mainwindow.h> +#include <tdeparts/browserinterface.h> +#include <tdeparts/browserextension.h> #include <kio/job.h> class KActionCollection; diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 0506906b..d80cccfb 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -35,14 +35,14 @@ #include <kbookmarkmanager.h> #include <kconfig.h> #include <kglobalsettings.h> -#include <khtml_settings.h> -#include <khtmlview.h> +#include <tdehtml_settings.h> +#include <tdehtmlview.h> #include <kiconloader.h> #include <klocale.h> #include <kpopupmenu.h> #include <kstandarddirs.h> #include <kstdaccel.h> -#include <kparts/browserinterface.h> +#include <tdeparts/browserinterface.h> #include <tqclipboard.h> #include <tqcstring.h> diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index eeeb3cbd..6e7527d2 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -41,8 +41,8 @@ #include <kpopupmenu.h> #include <krun.h> #include <klocale.h> -#include <khtmlview.h> -#include <khtml_part.h> +#include <tdehtmlview.h> +#include <tdehtml_part.h> #include <kiconloader.h> #include <kurl.h> #include <kurldrag.h> diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index fa62e128..299cedd1 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -26,7 +26,7 @@ #include <kaction.h> #include <kapplication.h> #include <kfiledialog.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <kiconloader.h> #include <klocale.h> #include <kmessagebox.h> @@ -35,7 +35,7 @@ #include <krun.h> #include <kshell.h> #include <kurl.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include <tqaccel.h> #include <tqclipboard.h> diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h index e7e0722d..d1d407f9 100644 --- a/akregator/src/viewer.h +++ b/akregator/src/viewer.h @@ -25,7 +25,7 @@ #ifndef VIEWER_H #define VIEWER_H -#include <khtml_part.h> +#include <tdehtml_part.h> class KURL; |