diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:47 -0600 |
| commit | da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb (patch) | |
| tree | b42ba87fcdfa425a31e243a62d71e1de248b6ee8 /kopete/protocols/oscar/aim | |
| 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/aim')
| -rw-r--r-- | kopete/protocols/oscar/aim/aimaccount.cpp | 2 | ||||
| -rw-r--r-- | kopete/protocols/oscar/aim/aimcontact.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index cd9e30a3..37bfb1dc 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -20,7 +20,7 @@ #include <tdeconfig.h> #include <kdialogbase.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <kmdcodec.h> diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index 2a8b0320..29cd585a 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -22,7 +22,7 @@ #include <tqtextcodec.h> #include <kapplication.h> -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <klocale.h> #include <kdebug.h> #include <kmessagebox.h> |