diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 21:57:18 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 21:57:18 -0600 |
commit | 958d14ea303abe33fce2c259c1000f18171e4229 (patch) | |
tree | 61bc8236ab3aa4bc27ca205740322f8df50baff1 /kghostview | |
parent | b2de6514213d205907e8de3dd17f8eb80d868a4f (diff) | |
download | tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.tar.gz tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kghostview')
-rw-r--r-- | kghostview/infodialog.cpp | 2 | ||||
-rw-r--r-- | kghostview/kdscerrordialog.cpp | 2 | ||||
-rw-r--r-- | kghostview/kgv_miniwidget.cpp | 4 | ||||
-rw-r--r-- | kghostview/kgv_view.cpp | 6 | ||||
-rw-r--r-- | kghostview/kgvconfigdialog.cpp | 6 | ||||
-rw-r--r-- | kghostview/kgvdocument.cpp | 6 | ||||
-rw-r--r-- | kghostview/kgvshell.cpp | 10 | ||||
-rw-r--r-- | kghostview/kpswidget.cpp | 4 | ||||
-rw-r--r-- | kghostview/logwindow.cpp | 4 | ||||
-rw-r--r-- | kghostview/main.cpp | 2 | ||||
-rw-r--r-- | kghostview/martdelist.cpp | 4 | ||||
-rw-r--r-- | kghostview/viewcontrol.cpp | 2 |
12 files changed, 26 insertions, 26 deletions
diff --git a/kghostview/infodialog.cpp b/kghostview/infodialog.cpp index 70826c11..e4a76006 100644 --- a/kghostview/infodialog.cpp +++ b/kghostview/infodialog.cpp @@ -24,7 +24,7 @@ #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdguiitem.h> #include "infodialog.h" diff --git a/kghostview/kdscerrordialog.cpp b/kghostview/kdscerrordialog.cpp index 61245ed5..350acb4d 100644 --- a/kghostview/kdscerrordialog.cpp +++ b/kghostview/kdscerrordialog.cpp @@ -21,7 +21,7 @@ #include <tqtextedit.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp index cb18e23c..94ca20bd 100644 --- a/kghostview/kgv_miniwidget.cpp +++ b/kghostview/kgv_miniwidget.cpp @@ -25,8 +25,8 @@ #include <kdebug.h> #include <kinstance.h> #include <tdeversion.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> // KLineEditDlg is depricated as of 3.2. use KInputDialog instead #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp index 79da9b2d..af4e8380 100644 --- a/kghostview/kgv_view.cpp +++ b/kghostview/kgv_view.cpp @@ -28,14 +28,14 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdirwatch.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kstdaction.h> #include <tdestdaccel.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/scheduler.h> #include <tdeaboutdata.h> diff --git a/kghostview/kgvconfigdialog.cpp b/kghostview/kgvconfigdialog.cpp index 0982cc65..887c4811 100644 --- a/kghostview/kgvconfigdialog.cpp +++ b/kghostview/kgvconfigdialog.cpp @@ -23,11 +23,11 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kinstance.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kstandarddirs.h> #include <tdeconfigdialog.h> diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp index 74adfd6a..1bc3fd40 100644 --- a/kghostview/kgvdocument.cpp +++ b/kghostview/kgvdocument.cpp @@ -25,13 +25,13 @@ #include <tdefiledialog.h> #include <kfilterdev.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <kprinter.h> #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "configuration.h" diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp index 78702ba6..753a4213 100644 --- a/kghostview/kgvshell.cpp +++ b/kghostview/kgvshell.cpp @@ -24,19 +24,19 @@ #include <tdefiledialog.h> #include <kiconloader.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kstatusbar.h> #include <kstdaction.h> #include <tdestdaccel.h> -#include <ktempfile.h> -#include <kmenubar.h> +#include <tdetempfile.h> +#include <tdemenubar.h> #include <kedittoolbar.h> #include <kdebug.h> #include <kicontheme.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdepopupmenu.h> #include <tdeparts/componentfactory.h> diff --git a/kghostview/kpswidget.cpp b/kghostview/kpswidget.cpp index 71ab8b85..aae2f479 100644 --- a/kghostview/kpswidget.cpp +++ b/kghostview/kpswidget.cpp @@ -25,8 +25,8 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include "configuration.h" diff --git a/kghostview/logwindow.cpp b/kghostview/logwindow.cpp index 82e85a99..2e94e45a 100644 --- a/kghostview/logwindow.cpp +++ b/kghostview/logwindow.cpp @@ -20,9 +20,9 @@ #include <tqlabel.h> #include <tqvbox.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kurllabel.h> -#include <klocale.h> +#include <tdelocale.h> #include "logwindow.h" diff --git a/kghostview/main.cpp b/kghostview/main.cpp index 41bcabf9..bc91d6ad 100644 --- a/kghostview/main.cpp +++ b/kghostview/main.cpp @@ -21,7 +21,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include "kgvshell.h" diff --git a/kghostview/martdelist.cpp b/kghostview/martdelist.cpp index 1f15e7d3..d8dc9b7b 100644 --- a/kghostview/martdelist.cpp +++ b/kghostview/martdelist.cpp @@ -26,8 +26,8 @@ #include <tqlabel.h> #include <tqwhatsthis.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kdebug.h> #include "kgv_miniwidget.h" diff --git a/kghostview/viewcontrol.cpp b/kghostview/viewcontrol.cpp index 84165e40..6c0cf0f5 100644 --- a/kghostview/viewcontrol.cpp +++ b/kghostview/viewcontrol.cpp @@ -20,7 +20,7 @@ #include "viewcontrol.h" #include "viewcontrol.moc" -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kbuttonbox.h> #include <kseparator.h> |