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 /ksirc/servercontroller.cpp | |
| 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 'ksirc/servercontroller.cpp')
| -rw-r--r-- | ksirc/servercontroller.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp index 58d46517..baf92e43 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -83,15 +83,15 @@ #include <kmenubar.h> #include <tdeconfig.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kiconloader.h> #include <twin.h> #include <kdebug.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kstandarddirs.h> #include <khelpmenu.h> #include <kstdaction.h> -#include <kaction.h> +#include <tdeaction.h> #include <knotifydialog.h> #include <netwm.h> #include <kpassivepopup.h> @@ -110,7 +110,7 @@ #endif #include <klocale.h> #include <kapplication.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> DisplayMgr *displayMgr; |