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 /kcontrol/randr | |
| 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 'kcontrol/randr')
| -rw-r--r-- | kcontrol/randr/configdialog.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/randr/configdialog.h | 2 | ||||
| -rw-r--r-- | kcontrol/randr/tderandrtray.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp index f2344f1c0..1d7ffcc41 100644 --- a/kcontrol/randr/configdialog.cpp +++ b/kcontrol/randr/configdialog.cpp @@ -28,7 +28,7 @@ #include <kiconloader.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <twinmodule.h> #include <kregexpeditorinterface.h> #include <tdeparts/componentfactory.h> diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h index 9ec755834..0728146ee 100644 --- a/kcontrol/randr/configdialog.h +++ b/kcontrol/randr/configdialog.h @@ -30,7 +30,7 @@ #include <kdialogbase.h> #include <keditlistbox.h> #include <kkeydialog.h> -#include <klistview.h> +#include <tdelistview.h> #include <knuminput.h> class TDEGlobalAccel; diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index 845f3e498..d44600c1d 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -20,14 +20,14 @@ #include <tqimage.h> #include <tqtooltip.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kcmultidialog.h> #include <kdebug.h> #include <khelpmenu.h> #include <kiconloader.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstdaction.h> #include <kstdguiitem.h> #include <kglobal.h> |