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/meanwhile | |
| 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/meanwhile')
| -rw-r--r-- | kopete/protocols/meanwhile/meanwhileaccount.cpp | 4 | ||||
| -rw-r--r-- | kopete/protocols/meanwhile/meanwhilecontact.cpp | 2 | ||||
| -rw-r--r-- | kopete/protocols/meanwhile/meanwhileplugin.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp index 91635c91..7350b425 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.cpp +++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp @@ -25,8 +25,8 @@ #include "kopetecontactlist.h" #include "kopetepassword.h" -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <tdeconfigbase.h> #include "kopeteaway.h" diff --git a/kopete/protocols/meanwhile/meanwhilecontact.cpp b/kopete/protocols/meanwhile/meanwhilecontact.cpp index e77d470a..e594dd57 100644 --- a/kopete/protocols/meanwhile/meanwhilecontact.cpp +++ b/kopete/protocols/meanwhile/meanwhilecontact.cpp @@ -15,7 +15,7 @@ ************************************************************************* */ -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <klocale.h> diff --git a/kopete/protocols/meanwhile/meanwhileplugin.h b/kopete/protocols/meanwhile/meanwhileplugin.h index c11a2b2f..15959124 100644 --- a/kopete/protocols/meanwhile/meanwhileplugin.h +++ b/kopete/protocols/meanwhile/meanwhileplugin.h @@ -18,7 +18,7 @@ #define __MEANWHILE_PLUGIN_H__ #include "tqstring.h" -#include <kaction.h> +#include <tdeaction.h> class TQLineEdit; |