summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kdvi/kdvi_multipage.cpp2
-rw-r--r--kghostview/CMakeLists.txt2
-rw-r--r--kghostview/Makefile.am4
-rw-r--r--kghostview/TODO2
-rw-r--r--kghostview/kgv_miniwidget.cpp8
-rw-r--r--kghostview/kgv_view.cpp6
-rw-r--r--kghostview/kgvdocument.cpp2
-rw-r--r--kghostview/marklist.cpp (renamed from kghostview/martdelist.cpp)2
-rw-r--r--kghostview/marklist.h (renamed from kghostview/martdelist.h)0
-rw-r--r--kviewshell/CMakeLists.txt2
-rw-r--r--kviewshell/Makefile.am2
-rw-r--r--kviewshell/marklist.cpp (renamed from kviewshell/martdelist.cpp)4
-rw-r--r--kviewshell/marklist.h (renamed from kviewshell/martdelist.h)0
-rw-r--r--kviewshell/tdemultipage.cpp6
-rw-r--r--kviewshell/tdemultipage.h2
15 files changed, 22 insertions, 22 deletions
diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp
index 6a578873..a9b26fde 100644
--- a/kdvi/kdvi_multipage.cpp
+++ b/kdvi/kdvi_multipage.cpp
@@ -26,7 +26,7 @@
#include "fontpool.h"
#include "kprinterwrapper.h"
#include "kviewpart.h"
-#include "martdelist.h"
+#include "marklist.h"
#include "optionDialogFontsWidget.h"
#include "optionDialogSpecialWidget.h"
#include "performanceMeasurement.h"
diff --git a/kghostview/CMakeLists.txt b/kghostview/CMakeLists.txt
index fe8fad8e..316f387e 100644
--- a/kghostview/CMakeLists.txt
+++ b/kghostview/CMakeLists.txt
@@ -41,7 +41,7 @@ install( PROGRAMS update-to-xt-names.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR}
tde_add_library( kghostviewlib SHARED AUTOMOC
SOURCES
kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp
- martdelist.cpp logwindow.cpp infodialog.cpp kgvpageview.cpp ps.c
+ marklist.cpp logwindow.cpp infodialog.cpp kgvpageview.cpp ps.c
kgv_view.cpp scrollbox.cpp kgvpagedecorator.cpp
kgvconfigdialog.cpp kgvmainwidget.cpp kdscerrordialog.cpp
displayoptions.cpp kpswidget.cpp fullscreenfilter.cpp
diff --git a/kghostview/Makefile.am b/kghostview/Makefile.am
index e2a92fcd..eae2dee0 100644
--- a/kghostview/Makefile.am
+++ b/kghostview/Makefile.am
@@ -17,7 +17,7 @@ libkghostviewpart_la_LIBADD = libkghostviewlib.la
# Check "make final" after making changes to the following line!!
libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
- martdelist.cpp logwindow.cpp infodialog.cpp \
+ marklist.cpp logwindow.cpp infodialog.cpp \
kgvpageview.cpp ps.c kgv_view.cpp scrollbox.cpp kgvpagedecorator.cpp \
kgvconfigdialog.cpp kgvmainwidget.cpp \
kdscerrordialog.cpp displayoptions.cpp kpswidget.cpp \
@@ -35,7 +35,7 @@ libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined
libdscparse_la_LIBADD = $(LIB_QT)
libdscparse_la_SOURCES = $(top_srcdir)/kghostview/dscparse/dscparse.cpp $(top_srcdir)/kghostview/dscparse/dscparse_adapter.cpp
-noinst_HEADERS = martdelist.h logwindow.h infodialog.h kgvshell.h \
+noinst_HEADERS = marklist.h logwindow.h infodialog.h kgvshell.h \
kpswidget.h kgvpageview.h ps.h kgv_miniwidget.h kgv_view.h scrollbox.h \
kgvpagedecorator.h kgvconfigdialog.h kgvmainwidget.h $(top_srcdir)/kghostview/dscparse/dscparse.h \
$(top_srcdir)/kghostview/dscparse/dscparse_adapter.h kdscerrordialog.h kgvdocument.h displayoptions.h \
diff --git a/kghostview/TODO b/kghostview/TODO
index 113893dd..f747ff13 100644
--- a/kghostview/TODO
+++ b/kghostview/TODO
@@ -34,7 +34,7 @@
Done:
- Scrollbox should show a thumbnail (like kdvi).
-- New implementation for the martdelist because QTableView won't be in Qt-3.0
+- New implementation for the marklist because QTableView won't be in Qt-3.0
anymore. (I'll keep using QTableView, simply because there's no suitable
alternative in Qt3.)
diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp
index 94ca20bd..4d862c36 100644
--- a/kghostview/kgv_miniwidget.cpp
+++ b/kghostview/kgv_miniwidget.cpp
@@ -41,7 +41,7 @@
#include <stdlib.h>
#include "infodialog.h"
-#include "martdelist.h"
+#include "marklist.h"
#include "kgvdocument.h"
#include "kgv_view.h"
#include "version.h"
@@ -508,7 +508,7 @@ void KGVMiniWidget::buildTOC()
int last_page = 0;
- MarkList* martdelist = _part->markList();
+ MarkList* marklist = _part->markList();
if( dsc()->isStructured() ) {
if( _usePageLabels )
@@ -530,11 +530,11 @@ void KGVMiniWidget::buildTOC()
else
s = tip;
- martdelist->insertItem( s, i, tip );
+ marklist->insertItem( s, i, tip );
}
}
else {
- martdelist->insertItem( TQString::fromLatin1( "1" ), 0 );
+ marklist->insertItem( TQString::fromLatin1( "1" ), 0 );
}
}
diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index af4e8380..4ff28e14 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -50,7 +50,7 @@
#include "kpswidget.h"
#include "kgvfactory.h"
#include "logwindow.h"
-#include "martdelist.h"
+#include "marklist.h"
#include "scrollbox.h"
#include "version.h"
#include "configuration.h"
@@ -162,7 +162,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
_docManager->setPSWidget( _psWidget );
_docManager->setDocument( document() );
- _markList = new MarkList( _mainWidget, "martdelist", _docManager );
+ _markList = new MarkList( _mainWidget, "marklist", _docManager );
_markList->setFixedWidth( PAGELIST_WIDTH );
vlay->addWidget( _markList, 1 );
connect( TQT_TQOBJECT(_markList), TQT_SIGNAL( contextMenuRequested ( int, int, const TQPoint& ) ),
@@ -192,7 +192,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
actionCollection(), "info" );
//-- Edit Menu -----------------------------------------------------
- _popup = new TDEPopupMenu( _markList, "martdelist_menu" );
+ _popup = new TDEPopupMenu( _markList, "marklist_menu" );
TDEAction *act = new TDEAction( i18n( "Mark Current Page" ), "flag", CTRL+SHIFT+Key_M,
TQT_TQOBJECT(_markList), TQT_SLOT( markCurrent() ),
diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp
index 1bc3fd40..81691509 100644
--- a/kghostview/kgvdocument.cpp
+++ b/kghostview/kgvdocument.cpp
@@ -37,7 +37,7 @@
#include "configuration.h"
#include "kdscerrordialog.h"
#include "kgv_miniwidget.h"
-#include "martdelist.h"
+#include "marklist.h"
#include "kgvfactory.h"
extern "C" {
diff --git a/kghostview/martdelist.cpp b/kghostview/marklist.cpp
index d8dc9b7b..e05d521c 100644
--- a/kghostview/martdelist.cpp
+++ b/kghostview/marklist.cpp
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "martdelist.moc"
+#include "marklist.moc"
#include <cassert>
diff --git a/kghostview/martdelist.h b/kghostview/marklist.h
index 54992a88..54992a88 100644
--- a/kghostview/martdelist.h
+++ b/kghostview/marklist.h
diff --git a/kviewshell/CMakeLists.txt b/kviewshell/CMakeLists.txt
index 61156ee7..3ad83e46 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 martdelist.cpp tdemultipageInterface.skel
+ tdemultipage.cpp pageView.cpp marklist.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 4262ff4e..136a4177 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 martdelist.cpp tdemultipageInterface.skel \
+libtdemultipage_la_SOURCES = tdemultipage.cpp pageView.cpp marklist.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/martdelist.cpp b/kviewshell/marklist.cpp
index acc94311..798f4559 100644
--- a/kviewshell/martdelist.cpp
+++ b/kviewshell/marklist.cpp
@@ -38,10 +38,10 @@
#include "documentPageCache.h"
#include "kvsprefs.h"
-#include "martdelist.h"
+#include "marklist.h"
-#include "martdelist.moc"
+#include "marklist.moc"
namespace {
diff --git a/kviewshell/martdelist.h b/kviewshell/marklist.h
index 0ee15758..0ee15758 100644
--- a/kviewshell/martdelist.h
+++ b/kviewshell/marklist.h
diff --git a/kviewshell/tdemultipage.cpp b/kviewshell/tdemultipage.cpp
index 063b8f2d..8135cd83 100644
--- a/kviewshell/tdemultipage.cpp
+++ b/kviewshell/tdemultipage.cpp
@@ -20,7 +20,7 @@
#include <tqvbox.h>
#include "documentWidget.h"
-#include "martdelist.h"
+#include "marklist.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, "martdelist");
+ _markList = new MarkList(sideBar, "marklist");
sideBar->addItem(_markList, TQIconSet(SmallIcon("thumbnail")), i18n("Thumbnails"));
// Restore state of the sidebar
@@ -898,7 +898,7 @@ void KMultiPage::updateWidgetSize(const PageNumber& pageNumber)
}
}
- // Update martdelist
+ // Update marklist
markList()->updateWidgetSize(pageNumber);
}
diff --git a/kviewshell/tdemultipage.h b/kviewshell/tdemultipage.h
index dfc4a076..1e0910ee 100644
--- a/kviewshell/tdemultipage.h
+++ b/kviewshell/tdemultipage.h
@@ -7,7 +7,7 @@
#include "documentRenderer.h"
#include "history.h"
#include "tdemultipageInterface.h"
-#include "martdelist.h"
+#include "marklist.h"
#include <tdeparts/part.h>
#include <tqtimer.h>