diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:16 -0600 |
| commit | 6630d485e98adf6125ddcaec8a64c9c209e4977c (patch) | |
| tree | 689aabd56ebbeead89c4f1625e739b58d6db7c68 /kweather | |
| parent | d9056e4cfc9bb3187d193deac2355fce73254d2e (diff) | |
| download | tdetoys-6630d485e98adf6125ddcaec8a64c9c209e4977c.tar.gz tdetoys-6630d485e98adf6125ddcaec8a64c9c209e4977c.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kweather')
| -rw-r--r-- | kweather/kweather.cpp | 2 | ||||
| -rw-r--r-- | kweather/serviceconfigdata.ui | 4 | ||||
| -rw-r--r-- | kweather/serviceconfigwidget.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp index e7d2fcd..120fdf2 100644 --- a/kweather/kweather.cpp +++ b/kweather/kweather.cpp @@ -23,7 +23,7 @@ #include <klocale.h> #include <kiconloader.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tdeconfig.h> #include <ksettings/dialog.h> #include <ksettings/dispatcher.h> diff --git a/kweather/serviceconfigdata.ui b/kweather/serviceconfigdata.ui index dfed656..e6ee7f3 100644 --- a/kweather/serviceconfigdata.ui +++ b/kweather/serviceconfigdata.ui @@ -255,7 +255,7 @@ <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> - <includehint>klistview.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kweather/serviceconfigwidget.cpp b/kweather/serviceconfigwidget.cpp index a4fb2f7..3671be4 100644 --- a/kweather/serviceconfigwidget.cpp +++ b/kweather/serviceconfigwidget.cpp @@ -26,7 +26,7 @@ #include <tdeconfig.h> #include <kdialog.h> #include <kglobal.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kpushbutton.h> #include <kstandarddirs.h> |