diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:21:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:21:47 -0600 |
| commit | da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb (patch) | |
| tree | b42ba87fcdfa425a31e243a62d71e1de248b6ee8 /kopete/protocols/oscar/icq | |
| parent | 4ed8d784e29102ed1659f4ccf71fcc6fb0dad5c8 (diff) | |
| download | tdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.tar.gz tdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/oscar/icq')
| -rw-r--r-- | kopete/protocols/oscar/icq/icqaccount.cpp | 2 | ||||
| -rw-r--r-- | kopete/protocols/oscar/icq/icqcontact.cpp | 4 | ||||
| -rw-r--r-- | kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp | 2 | ||||
| -rw-r--r-- | kopete/protocols/oscar/icq/ui/icqsearchbase.ui | 2 | ||||
| -rw-r--r-- | kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp index 7627648c..53ca409a 100644 --- a/kopete/protocols/oscar/icq/icqaccount.cpp +++ b/kopete/protocols/oscar/icq/icqaccount.cpp @@ -20,7 +20,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmdcodec.h> #include <kmessagebox.h> diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp index 19d2ee7f..5acd5859 100644 --- a/kopete/protocols/oscar/icq/icqcontact.cpp +++ b/kopete/protocols/oscar/icq/icqcontact.cpp @@ -21,8 +21,8 @@ #include <tqimage.h> #include <tqfile.h> -#include <kaction.h> -#include <kactionclasses.h> +#include <tdeaction.h> +#include <tdeactionclasses.h> #include <kapplication.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp index 935b9853..a5071753 100644 --- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp +++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kpushbutton.h> #include <kmessagebox.h> diff --git a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui index a027985f..e2fb2c6b 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui +++ b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui @@ -486,7 +486,7 @@ <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp index f8b16198..59cf7e92 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp +++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp @@ -26,7 +26,7 @@ #include <tqtabwidget.h> #include <kdebug.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kpushbutton.h> #include <kmessagebox.h> |