diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 23:20:36 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 23:20:36 -0600 |
commit | 81576b133797828eaca3ac819f4adca21de8d327 (patch) | |
tree | bb7f38c27a3f21d50df51a745c15739dde29bc68 /kghostview/kgv_view.cpp | |
parent | 32ace734b36de108d8322157aaa106069df16477 (diff) | |
download | tdegraphics-81576b133797828eaca3ac819f4adca21de8d327.tar.gz tdegraphics-81576b133797828eaca3ac819f4adca21de8d327.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kghostview/kgv_view.cpp')
-rw-r--r-- | kghostview/kgv_view.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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() ), |