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 /kpdf | |
| 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 'kpdf')
| -rw-r--r-- | kpdf/conf/preferencesdialog.h | 2 | ||||
| -rw-r--r-- | kpdf/part.cpp | 6 | ||||
| -rw-r--r-- | kpdf/shell/shell.cpp | 4 | ||||
| -rw-r--r-- | kpdf/ui/pageview.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/kpdf/conf/preferencesdialog.h b/kpdf/conf/preferencesdialog.h index 488eb763..bc7b0cbf 100644 --- a/kpdf/conf/preferencesdialog.h +++ b/kpdf/conf/preferencesdialog.h @@ -10,7 +10,7 @@ #ifndef _PREFERENCESDIALOG_H #define _PREFERENCESDIALOG_H -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include "conf/settings.h" class TQWidget; diff --git a/kpdf/part.cpp b/kpdf/part.cpp index f36d6ce5..0b3b9ca9 100644 --- a/kpdf/part.cpp +++ b/kpdf/part.cpp @@ -44,13 +44,13 @@ #include <tdeversion.h> #include <tdeparts/genericfactory.h> #include <kurldrag.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <kfinddialog.h> #include <knuminput.h> #include <kiconloader.h> -#include <kio/netaccess.h> -#include <kio/job.h> +#include <tdeio/netaccess.h> +#include <tdeio/job.h> #include <kpopupmenu.h> #include <kprocess.h> #include <kstandarddirs.h> diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp index 5491321e..8b101fa9 100644 --- a/kpdf/shell/shell.cpp +++ b/kpdf/shell/shell.cpp @@ -23,7 +23,7 @@ #include <kaction.h> #include <kapplication.h> #include <kedittoolbar.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klibloader.h> #include <kmessagebox.h> #include <kstdaction.h> @@ -32,7 +32,7 @@ #include <klocale.h> #include <kmenubar.h> #include <tdeparts/componentfactory.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kmainwindowiface.h> // local includes diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp index 7b4d0e75..a76d03ea 100644 --- a/kpdf/ui/pageview.cpp +++ b/kpdf/ui/pageview.cpp @@ -34,7 +34,7 @@ #include <kactioncollection.h> #include <kpopupmenu.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimageeffect.h> #include <kimageio.h> #include <kapplication.h> |