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/sms | |
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/sms')
-rw-r--r-- | kopete/protocols/sms/smsaccount.cpp | 4 | ||||
-rw-r--r-- | kopete/protocols/sms/smscontact.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index 6e09bd11..4cfd4788 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -17,8 +17,8 @@ #undef KDE_NO_COMPAT #include <tdeconfigbase.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kprocess.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/kopete/protocols/sms/smscontact.cpp b/kopete/protocols/sms/smscontact.cpp index 5e4c9cb4..e15861ee 100644 --- a/kopete/protocols/sms/smscontact.cpp +++ b/kopete/protocols/sms/smscontact.cpp @@ -16,7 +16,7 @@ #undef KDE_NO_COMPAT #include <tdeconfigbase.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> |