diff options
Diffstat (limited to 'kviewshell')
| -rw-r--r-- | kviewshell/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kviewshell/Makefile.am | 2 | ||||
| -rw-r--r-- | kviewshell/documentWidget.cpp | 2 | ||||
| -rw-r--r-- | kviewshell/kviewpart.cpp | 4 | ||||
| -rw-r--r-- | kviewshell/kviewshell.cpp | 2 | ||||
| -rw-r--r-- | kviewshell/martdelist.cpp | 6 | ||||
| -rw-r--r-- | kviewshell/plugins/djvu/djvumultipage.cpp | 2 | ||||
| -rw-r--r-- | kviewshell/tableOfContents.h | 2 | ||||
| -rw-r--r-- | kviewshell/tdemultipage.cpp | 8 | ||||
| -rw-r--r-- | kviewshell/tdemultipage.h | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/kviewshell/CMakeLists.txt b/kviewshell/CMakeLists.txt index 3ad83e46..61156ee7 100644 --- a/kviewshell/CMakeLists.txt +++ b/kviewshell/CMakeLists.txt @@ -71,7 +71,7 @@ tde_add_library( kviewshell STATIC_PIC AUTOMOC tde_add_library( tdemultipage SHARED AUTOMOC SOURCES - tdemultipage.cpp pageView.cpp marklist.cpp tdemultipageInterface.skel + tdemultipage.cpp pageView.cpp martdelist.cpp tdemultipageInterface.skel units.cpp pageSize.cpp simplePageSize.cpp renderedDocumentPage.cpp renderedDocumentPagePixmap.cpp renderedDocumentPagePrinter.cpp documentPageCache.cpp documentWidget.cpp searchWidget.cpp diff --git a/kviewshell/Makefile.am b/kviewshell/Makefile.am index 136a4177..4262ff4e 100644 --- a/kviewshell/Makefile.am +++ b/kviewshell/Makefile.am @@ -20,7 +20,7 @@ kviewerpart_la_SOURCES = kviewpart.cpp pageSizeWidget_base.ui \ kviewerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module kviewerpart_la_LIBADD = ./libifaces.la $(LIB_TDEFILE) -ltdeparts -libtdemultipage_la_SOURCES = tdemultipage.cpp pageView.cpp marklist.cpp tdemultipageInterface.skel \ +libtdemultipage_la_SOURCES = tdemultipage.cpp pageView.cpp martdelist.cpp tdemultipageInterface.skel \ units.cpp pageSize.cpp simplePageSize.cpp renderedDocumentPage.cpp renderedDocumentPagePixmap.cpp \ renderedDocumentPagePrinter.cpp documentPageCache.cpp documentWidget.cpp searchWidget.cpp \ selection.cpp documentRenderer.cpp history.cpp kvsprefs.kcfgc tableOfContents.cpp \ diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp index 4db64d0b..04dffc75 100644 --- a/kviewshell/documentWidget.cpp +++ b/kviewshell/documentWidget.cpp @@ -11,7 +11,7 @@ #include <config.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <kglobalsettings.h> diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index d165fc38..69c3a4a3 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -9,8 +9,8 @@ #include <tqprintdialog.h> #include <kaboutdialog.h> -#include <kaccel.h> -#include <kaction.h> +#include <tdeaccel.h> +#include <tdeaction.h> #include <kapplication.h> #include <tdeconfig.h> #include <tdeconfigdialog.h> diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp index 93a39b7f..1975a6ea 100644 --- a/kviewshell/kviewshell.cpp +++ b/kviewshell/kviewshell.cpp @@ -15,7 +15,7 @@ #include <kiconloader.h> #include <kstandarddirs.h> #include <kapplication.h> -#include <kaction.h> +#include <tdeaction.h> #include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> diff --git a/kviewshell/martdelist.cpp b/kviewshell/martdelist.cpp index 1cbf6581..ad9f284d 100644 --- a/kviewshell/martdelist.cpp +++ b/kviewshell/martdelist.cpp @@ -32,16 +32,16 @@ #include <kapplication.h> #include <kglobalsettings.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kiconloader.h> #include <kdebug.h> #include "documentPageCache.h" #include "kvsprefs.h" -#include "marklist.h" +#include "martdelist.h" -#include "marklist.moc" +#include "martdelist.moc" namespace { diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp index 0a8cdd78..ad044d20 100644 --- a/kviewshell/plugins/djvu/djvumultipage.cpp +++ b/kviewshell/plugins/djvu/djvumultipage.cpp @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <kaction.h> +#include <tdeaction.h> #include <kdialogbase.h> #include <tdefiledialog.h> #include <tdeparts/genericfactory.h> diff --git a/kviewshell/tableOfContents.h b/kviewshell/tableOfContents.h index ccd106e8..d4f58c44 100644 --- a/kviewshell/tableOfContents.h +++ b/kviewshell/tableOfContents.h @@ -24,7 +24,7 @@ #include "anchor.h" -#include <klistview.h> +#include <tdelistview.h> class Bookmark; diff --git a/kviewshell/tdemultipage.cpp b/kviewshell/tdemultipage.cpp index d08dead7..0b2b83fd 100644 --- a/kviewshell/tdemultipage.cpp +++ b/kviewshell/tdemultipage.cpp @@ -1,6 +1,6 @@ #include <config.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kdebug.h> #include <tdefiledialog.h> @@ -20,7 +20,7 @@ #include <tqvbox.h> #include "documentWidget.h" -#include "marklist.h" +#include "martdelist.h" #include "tableOfContents.h" #include "kprintDialogPage_pageoptions.h" #include "kvsprefs.h" @@ -66,7 +66,7 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject connect(tableOfContents, TQT_SIGNAL(gotoPage(const Anchor&)), this, TQT_SLOT(gotoPage(const Anchor&))); // Create MarkList - _markList = new MarkList(sideBar, "marklist"); + _markList = new MarkList(sideBar, "martdelist"); sideBar->addItem(_markList, TQIconSet(SmallIcon("thumbnail")), i18n("Thumbnails")); // Restore state of the sidebar @@ -898,7 +898,7 @@ void KMultiPage::updateWidgetSize(const PageNumber& pageNumber) } } - // Update marklist + // Update martdelist markList()->updateWidgetSize(pageNumber); } diff --git a/kviewshell/tdemultipage.h b/kviewshell/tdemultipage.h index 1e0910ee..dfc4a076 100644 --- a/kviewshell/tdemultipage.h +++ b/kviewshell/tdemultipage.h @@ -7,7 +7,7 @@ #include "documentRenderer.h" #include "history.h" #include "tdemultipageInterface.h" -#include "marklist.h" +#include "martdelist.h" #include <tdeparts/part.h> #include <tqtimer.h> |