summaryrefslogtreecommitdiffstats
path: root/kiten/kiten.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:44:46 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:44:46 -0600
commitcee429821aa6f1acc97fb482d325fb4eb37376ca (patch)
tree4f55e04b7f000c854fe2b8347dcdb62d97de3c73 /kiten/kiten.h
parentab801f72ab45e8066a8ec6c533ef13c2da67e559 (diff)
downloadtdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.tar.gz
tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kiten/kiten.h')
-rw-r--r--kiten/kiten.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/kiten/kiten.h b/kiten/kiten.h
index 158c57c7..f82542fb 100644
--- a/kiten/kiten.h
+++ b/kiten/kiten.h
@@ -31,7 +31,7 @@
class Config;
class ConfigureDialog;
class EditAction;
-class KGlobalAccel;
+class TDEGlobalAccel;
class KStatusBar;
class KToggleAction;
class KListAction;
@@ -110,7 +110,7 @@ private:
KAction *backAction;
KAction *forwardAction;
- KGlobalAccel *Accel;
+ TDEGlobalAccel *Accel;
void doSearch(const TQString &text, TQRegExp regexp);
void doSearchInResults(const TQString &text, TQRegExp regexp);