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 /ksirc/toplevel.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/toplevel.cpp')
| -rw-r--r-- | ksirc/toplevel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index a6b7518d..e2530cc9 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -64,7 +64,7 @@ #include <kdebug.h> #include <twin.h> #include <knotifyclient.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <klocale.h> #include <tdefiledialog.h> @@ -72,7 +72,7 @@ #include <tdeio/netaccess.h> #include <kstatusbar.h> #include <kstdaction.h> -#include <kaction.h> +#include <tdeaction.h> #include <kcharsets.h> #include <kglobalsettings.h> #include <kstdguiitem.h> @@ -1286,7 +1286,7 @@ void KSircTopLevel::control_message(int command, TQString str) } setName(m_channelInfo.server().utf8() + "_" + m_channelInfo.channel().utf8() + "_" + "toplevel"); pan->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_" + TQSPLITTER_OBJECT_NAME_STRING); - kmenu->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_ktoolframe"); + kmenu->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_tdetoolframe"); linee->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_" + "LineEnter"); kmenu->show(); setCaption(m_channelInfo.channel()); |