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 /ksplashml | |
| 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 'ksplashml')
| -rw-r--r-- | ksplashml/kcmksplash/installer.h | 2 | ||||
| -rw-r--r-- | ksplashml/themeengine/redmond/themeredmond.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ksplashml/kcmksplash/installer.h b/ksplashml/kcmksplash/installer.h index 93d4bb76d..7a46e368b 100644 --- a/ksplashml/kcmksplash/installer.h +++ b/ksplashml/kcmksplash/installer.h @@ -14,7 +14,7 @@ #include <tqmap.h> #include <tqpoint.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <kurl.h> class TQLabel; diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp index 4b19a3012..95c21b831 100644 --- a/ksplashml/themeengine/redmond/themeredmond.cpp +++ b/ksplashml/themeengine/redmond/themeredmond.cpp @@ -17,7 +17,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> -#include <kfontcombo.h> +#include <tdefontcombo.h> #include <kgenericfactory.h> #include <kglobalsettings.h> #include <kiconloader.h> |