diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:03:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:03:37 -0600 |
| commit | 2e25fa39cd67cca2472d3eabdb478feb517d72a5 (patch) | |
| tree | 63725962f632d152cbf20709191d39f6fc865966 /kviewshell | |
| parent | 190d88dfc662f3fc466c9d1f53acbbea65f33c49 (diff) | |
| download | tdegraphics-2e25fa39cd67cca2472d3eabdb478feb517d72a5.tar.gz tdegraphics-2e25fa39cd67cca2472d3eabdb478feb517d72a5.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kviewshell')
| -rw-r--r-- | kviewshell/kviewpart.cpp | 8 | ||||
| -rw-r--r-- | kviewshell/kviewshell.cpp | 2 | ||||
| -rw-r--r-- | kviewshell/kvsprefs.kcfgc | 2 | ||||
| -rw-r--r-- | kviewshell/plugins/djvu/djvumultipage.cpp | 2 | ||||
| -rw-r--r-- | kviewshell/plugins/djvu/prefs.kcfgc | 2 | ||||
| -rw-r--r-- | kviewshell/tdemultipage.cpp | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index f76c5dd2..017d3e17 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -12,16 +12,16 @@ #include <kaccel.h> #include <kaction.h> #include <kapplication.h> -#include <kconfig.h> -#include <kconfigdialog.h> +#include <tdeconfig.h> +#include <tdeconfigdialog.h> #include <kdebug.h> #include <kdirwatch.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kfilterbase.h> #include <kfilterdev.h> #include <kglobal.h> #include <kinstance.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <klocale.h> #include <kiconloader.h> #include <kmessagebox.h> diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp index b155e73e..a45563c3 100644 --- a/kviewshell/kviewshell.cpp +++ b/kviewshell/kviewshell.cpp @@ -16,7 +16,7 @@ #include <kstandarddirs.h> #include <kapplication.h> #include <kaction.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kviewshell/kvsprefs.kcfgc b/kviewshell/kvsprefs.kcfgc index c507ba3d..f72f4bd0 100644 --- a/kviewshell/kvsprefs.kcfgc +++ b/kviewshell/kvsprefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kviewshell.kcfg ClassName=KVSPrefs Singleton=true diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp index dd6d08b1..c60c7c9c 100644 --- a/kviewshell/plugins/djvu/djvumultipage.cpp +++ b/kviewshell/plugins/djvu/djvumultipage.cpp @@ -23,7 +23,7 @@ #include <kaction.h> #include <kdialogbase.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tdeparts/genericfactory.h> #include <kprinter.h> #include <ktempfile.h> diff --git a/kviewshell/plugins/djvu/prefs.kcfgc b/kviewshell/plugins/djvu/prefs.kcfgc index 93a7650b..80838068 100644 --- a/kviewshell/plugins/djvu/prefs.kcfgc +++ b/kviewshell/plugins/djvu/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=djvumultipage.kcfg ClassName=Prefs Singleton=true diff --git a/kviewshell/tdemultipage.cpp b/kviewshell/tdemultipage.cpp index b6b98855..d08dead7 100644 --- a/kviewshell/tdemultipage.cpp +++ b/kviewshell/tdemultipage.cpp @@ -3,9 +3,9 @@ #include <kaction.h> #include <kapplication.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <klocale.h> #include <kmessagebox.h> #include <kprinter.h> |