diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 23:09:20 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 23:09:20 -0600 |
commit | f052e0f1fafde885e6bf192117369d70fa711035 (patch) | |
tree | df683e083186a42d3f95eca02ede7d2e8dd560ac /src/basket.cpp | |
parent | 7864df7a5e0a69bb3e525ec3e47256bdcbf2832b (diff) | |
download | basket-f052e0f1fafde885e6bf192117369d70fa711035.tar.gz basket-f052e0f1fafde885e6bf192117369d70fa711035.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/basket.cpp')
-rw-r--r-- | src/basket.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/basket.cpp b/src/basket.cpp index f18c8cc..1064349 100644 --- a/src/basket.cpp +++ b/src/basket.cpp @@ -49,7 +49,7 @@ #include <unistd.h> // For sleep() -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kiconloader.h> #include <krun.h> @@ -5485,13 +5485,13 @@ void Basket::lock() #include <tqstring.h> #include <tqpixmap.h> #include <tqcolor.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kurllabel.h> #include <tqcheckbox.h> #include <tqpalette.h> #include <tqcursor.h> #include <tqaction.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kglobalsettings.h> #include <tqevent.h> |