diff options
Diffstat (limited to 'kghostview')
| -rw-r--r-- | kghostview/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kghostview/Makefile.am | 4 | ||||
| -rw-r--r-- | kghostview/TODO | 2 | ||||
| -rw-r--r-- | kghostview/kgv_miniwidget.cpp | 8 | ||||
| -rw-r--r-- | kghostview/kgv_view.cpp | 12 | ||||
| -rw-r--r-- | kghostview/kgvdocument.cpp | 2 | ||||
| -rw-r--r-- | kghostview/kgvshell.cpp | 6 | ||||
| -rw-r--r-- | kghostview/martdelist.cpp | 2 |
8 files changed, 19 insertions, 19 deletions
diff --git a/kghostview/CMakeLists.txt b/kghostview/CMakeLists.txt index 316f387e..fe8fad8e 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 - marklist.cpp logwindow.cpp infodialog.cpp kgvpageview.cpp ps.c + martdelist.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 eae2dee0..e2a92fcd 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 \ - marklist.cpp logwindow.cpp infodialog.cpp \ + martdelist.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 = marklist.h logwindow.h infodialog.h kgvshell.h \ +noinst_HEADERS = martdelist.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 f747ff13..113893dd 100644 --- a/kghostview/TODO +++ b/kghostview/TODO @@ -34,7 +34,7 @@ Done: - Scrollbox should show a thumbnail (like kdvi). -- New implementation for the marklist because QTableView won't be in Qt-3.0 +- New implementation for the martdelist 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 d8210cdf..a9c46dc6 100644 --- a/kghostview/kgv_miniwidget.cpp +++ b/kghostview/kgv_miniwidget.cpp @@ -41,7 +41,7 @@ #include <stdlib.h> #include "infodialog.h" -#include "marklist.h" +#include "martdelist.h" #include "kgvdocument.h" #include "kgv_view.h" #include "version.h" @@ -508,7 +508,7 @@ void KGVMiniWidget::buildTOC() int last_page = 0; - MarkList* marklist = _part->markList(); + MarkList* martdelist = _part->markList(); if( dsc()->isStructured() ) { if( _usePageLabels ) @@ -530,11 +530,11 @@ void KGVMiniWidget::buildTOC() else s = tip; - marklist->insertItem( s, i, tip ); + martdelist->insertItem( s, i, tip ); } } else { - marklist->insertItem( TQString::fromLatin1( "1" ), 0 ); + martdelist->insertItem( TQString::fromLatin1( "1" ), 0 ); } } diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp index 97c6965b..ff5162ca 100644 --- a/kghostview/kgv_view.cpp +++ b/kghostview/kgv_view.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqregexp.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <tdeconfig.h> #include <kdebug.h> @@ -32,9 +32,9 @@ #include <kiconloader.h> #include <kinstance.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstdaction.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <ktempfile.h> #include <tdeio/scheduler.h> #include <kaboutdata.h> @@ -50,7 +50,7 @@ #include "kpswidget.h" #include "kgvfactory.h" #include "logwindow.h" -#include "marklist.h" +#include "martdelist.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, "marklist", _docManager ); + _markList = new MarkList( _mainWidget, "martdelist", _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, "marklist_menu" ); + _popup = new TDEPopupMenu( _markList, "martdelist_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 6303591e..74adfd6a 100644 --- a/kghostview/kgvdocument.cpp +++ b/kghostview/kgvdocument.cpp @@ -37,7 +37,7 @@ #include "configuration.h" #include "kdscerrordialog.h" #include "kgv_miniwidget.h" -#include "marklist.h" +#include "martdelist.h" #include "kgvfactory.h" extern "C" { diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp index 2cf72258..17544d6a 100644 --- a/kghostview/kgvshell.cpp +++ b/kghostview/kgvshell.cpp @@ -19,7 +19,7 @@ #include <assert.h> #include <stdlib.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <tdefiledialog.h> #include <kiconloader.h> @@ -29,7 +29,7 @@ #include <kstandarddirs.h> #include <kstatusbar.h> #include <kstdaction.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <ktempfile.h> #include <kmenubar.h> #include <kedittoolbar.h> @@ -37,7 +37,7 @@ #include <kicontheme.h> #include <kglobal.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdeparts/componentfactory.h> #include <twin.h> diff --git a/kghostview/martdelist.cpp b/kghostview/martdelist.cpp index 9505b965..1f15e7d3 100644 --- a/kghostview/martdelist.cpp +++ b/kghostview/martdelist.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "marklist.moc" +#include "martdelist.moc" #include <cassert> |