diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kdesktop/desktop.cc | |
| 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 'kdesktop/desktop.cc')
| -rw-r--r-- | kdesktop/desktop.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index 9ff390ec6..5b125de2c 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -26,7 +26,7 @@ #include "kdiconview.h" #include "minicli.h" #include "kdesktopsettings.h" -#include "klaunchsettings.h" +#include "tdelaunchsettings.h" #include <string.h> #include <unistd.h> @@ -59,12 +59,12 @@ #include <krun.h> #include <twin.h> #include <kglobalsettings.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kapplication.h> #include <kdirlister.h> // Create the equivalent of TDEAccelBase::connectItem // and then remove this include and fix reconnects in initRoot() -- ellis -//#include <kaccelbase.h> +//#include <tdeaccelbase.h> extern int kdesktop_screen_number; extern TQCString kdesktop_name, kicker_name, twin_name; |