diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kpager | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kpager')
| -rw-r--r-- | kpager/desktop.cpp | 2 | ||||
| -rw-r--r-- | kpager/kpager.cpp | 4 | ||||
| -rw-r--r-- | kpager/kpager.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index b1b37ecac..717e90491 100644 --- a/kpager/desktop.cpp +++ b/kpager/desktop.cpp @@ -37,7 +37,7 @@ #include <kdebug.h> #include <ksharedpixmap.h> #include <kpixmapio.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <netwm.h> #include <tqcstring.h> #include <tqpixmap.h> diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index d689b7140..dac64ab5a 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -44,7 +44,7 @@ #include <kapplication.h> #include <kglobalsettings.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kglobal.h> #include <tdeconfig.h> @@ -55,7 +55,7 @@ #include <netwm.h> #include "desktop.h" #include <tqpopupmenu.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kiconloader.h> #include <assert.h> diff --git a/kpager/kpager.h b/kpager/kpager.h index b1d0dacf5..4a3d2ef8f 100644 --- a/kpager/kpager.h +++ b/kpager/kpager.h @@ -27,7 +27,7 @@ #include <tqwidget.h> #include <tqintdict.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <twin.h> #include "kpagerIface.h" |