diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:16 -0600 |
| commit | 87637dc2c2be8595397e4898dbe72658508063c3 (patch) | |
| tree | 1e510115ec42676e15f7e9365c1cb982898a92b0 /tdenetworkmanager | |
| parent | f7749e6cbc34d76a644fb26225228a6b23dc4acd (diff) | |
| download | tdenetworkmanager-87637dc2c2be8595397e4898dbe72658508063c3.tar.gz tdenetworkmanager-87637dc2c2be8595397e4898dbe72658508063c3.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdenetworkmanager')
6 files changed, 10 insertions, 10 deletions
diff --git a/tdenetworkmanager/src/configwidgets/connection_setting_wireless.ui b/tdenetworkmanager/src/configwidgets/connection_setting_wireless.ui index 277f6ae..3b35de1 100644 --- a/tdenetworkmanager/src/configwidgets/connection_setting_wireless.ui +++ b/tdenetworkmanager/src/configwidgets/connection_setting_wireless.ui @@ -135,6 +135,6 @@ <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp index 492e367..d44b86e 100644 --- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp +++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp @@ -30,9 +30,9 @@ #include <tqtimer.h> #include <tqcheckbox.h> -#include <klistview.h> +#include <tdelistview.h> #include <klineedit.h> -#include <klistviewsearchline.h> +#include <tdelistviewsearchline.h> #include <kiconloader.h> #include <kglobal.h> #include <kpushbutton.h> diff --git a/tdenetworkmanager/src/tdenetman-connection_editor.cpp b/tdenetworkmanager/src/tdenetman-connection_editor.cpp index 36e795d..4ab62a2 100644 --- a/tdenetworkmanager/src/tdenetman-connection_editor.cpp +++ b/tdenetworkmanager/src/tdenetman-connection_editor.cpp @@ -37,7 +37,7 @@ #include <kiconloader.h> #include <kdebug.h> #include <kpushbutton.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kcombobox.h> #include <kmessagebox.h> diff --git a/tdenetworkmanager/src/tdenetman-menu_subhead.h b/tdenetworkmanager/src/tdenetman-menu_subhead.h index 0ec811a..d7917e2 100644 --- a/tdenetworkmanager/src/tdenetman-menu_subhead.h +++ b/tdenetworkmanager/src/tdenetman-menu_subhead.h @@ -33,8 +33,8 @@ #include <tqtooltip.h> #include <ksystemtray.h> #include <kuniqueapplication.h> -#include <kpopupmenu.h> -#include <kactionclasses.h> +#include <tdepopupmenu.h> +#include <tdeactionclasses.h> #include <kstdaction.h> #include <kstdguiitem.h> diff --git a/tdenetworkmanager/src/tdenetman-tray.h b/tdenetworkmanager/src/tdenetman-tray.h index f75564a..fef9480 100644 --- a/tdenetworkmanager/src/tdenetman-tray.h +++ b/tdenetworkmanager/src/tdenetman-tray.h @@ -36,8 +36,8 @@ #include <tqtooltip.h> #include <ksystemtray.h> #include <kuniqueapplication.h> -#include <kpopupmenu.h> -#include <kactionclasses.h> +#include <tdepopupmenu.h> +#include <tdeactionclasses.h> #include <kstdaction.h> #include <kstdguiitem.h> diff --git a/tdenetworkmanager/src/tdenetman-wireless_menuitem.h b/tdenetworkmanager/src/tdenetman-wireless_menuitem.h index 6bb5ef4..717e1a0 100644 --- a/tdenetworkmanager/src/tdenetman-wireless_menuitem.h +++ b/tdenetworkmanager/src/tdenetman-wireless_menuitem.h @@ -33,8 +33,8 @@ #include <tqtooltip.h> #include <ksystemtray.h> #include <kuniqueapplication.h> -#include <kpopupmenu.h> -#include <kactionclasses.h> +#include <tdepopupmenu.h> +#include <tdeactionclasses.h> #include <kstdaction.h> #include <kstdguiitem.h> |