diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
commit | c48e769eb275917717e2b55eb869f7e559293ac8 (patch) | |
tree | 8f650b907e21c918b826f854dbe1c8174cc2c0c6 /ksirc/servercontroller.h | |
parent | 8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff) | |
download | tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'ksirc/servercontroller.h')
-rw-r--r-- | ksirc/servercontroller.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ksirc/servercontroller.h b/ksirc/servercontroller.h index 585583b4..f6d8024d 100644 --- a/ksirc/servercontroller.h +++ b/ksirc/servercontroller.h @@ -34,7 +34,7 @@ class ProcCommand; class TQLabel; class KMenuBar; class KSircServer; -class KGlobalAccel; +class TDEGlobalAccel; class nickColourMaker; class dockServerController; @@ -116,7 +116,7 @@ public: void checkDocking(); - KGlobalAccel *getGlobalAccel(){ return m_kga; } + TDEGlobalAccel *getGlobalAccel(){ return m_kga; } signals: /** @@ -229,7 +229,7 @@ private: TQPopupMenu *options, *connections; int join_id, server_id; - KGlobalAccel *m_kga; + TDEGlobalAccel *m_kga; int open_toplevels; |