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 /krfb | |
| 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 'krfb')
| -rw-r--r-- | krfb/krfb/invitation.h | 2 | ||||
| -rw-r--r-- | krfb/krfb/main.cpp | 2 | ||||
| -rw-r--r-- | krfb/krfb/manageinvitations.ui | 4 | ||||
| -rw-r--r-- | krfb/krfb/trayicon.cpp | 2 | ||||
| -rw-r--r-- | krfb/krfb/trayicon.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/krfb/krfb/invitation.h b/krfb/krfb/invitation.h index fd72f0fd..8456f0db 100644 --- a/krfb/krfb/invitation.h +++ b/krfb/krfb/invitation.h @@ -19,7 +19,7 @@ #define INVITATION_H #include <kapplication.h> -#include <klistview.h> +#include <tdelistview.h> #include <tdeconfig.h> #include <tqobject.h> #include <tqstring.h> diff --git a/krfb/krfb/main.cpp b/krfb/krfb/main.cpp index 8991be48..36df4b2f 100644 --- a/krfb/krfb/main.cpp +++ b/krfb/krfb/main.cpp @@ -21,7 +21,7 @@ #include "rfbcontroller.h" #include <kpixmap.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kapplication.h> #include <knotifyclient.h> diff --git a/krfb/krfb/manageinvitations.ui b/krfb/krfb/manageinvitations.ui index b6c5f888..34f6590c 100644 --- a/krfb/krfb/manageinvitations.ui +++ b/krfb/krfb/manageinvitations.ui @@ -202,7 +202,7 @@ </connection> </connections> <includes> - <include location="global" impldecl="in declaration">klistview.h</include> + <include location="global" impldecl="in declaration">tdelistview.h</include> <include location="local" impldecl="in implementation">manageinvitations.ui.h</include> </includes> <Q_SLOTS> @@ -211,6 +211,6 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp index 98824109..849c42f8 100644 --- a/krfb/krfb/trayicon.cpp +++ b/krfb/krfb/trayicon.cpp @@ -23,7 +23,7 @@ #include <kdialog.h> #include <kglobal.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> KPassivePopup2::KPassivePopup2(TQWidget *parent) : KPassivePopup(parent){ diff --git a/krfb/krfb/trayicon.h b/krfb/krfb/trayicon.h index 66799e6e..134f883d 100644 --- a/krfb/krfb/trayicon.h +++ b/krfb/krfb/trayicon.h @@ -22,7 +22,7 @@ #include <tqwidget.h> #include <kpixmap.h> -#include <kaction.h> +#include <tdeaction.h> #include <ksystemtray.h> #include <kpassivepopup.h> |