diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-25 01:21:16 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-25 01:21:16 +0900 |
| commit | 2570c69db32aa5bc5034ed715b9ca273ea39677a (patch) | |
| tree | 0b18a8a41904b208d45272f4449c0babb3cecbf6 | |
| parent | 0ad22fde32f7218b2229ff1b25226a80e8f2a989 (diff) | |
| download | kvirc-2570c69d.tar.gz kvirc-2570c69d.zip | |
Remove QT_CLEAN_NAMESPACE/TQT_CLEAN_NAMESPACE unnecessary define.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | src/kvirc/ui/kvi_input.cpp | 11 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_ircview.cpp | 9 |
2 files changed, 2 insertions, 18 deletions
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 1d5f12b..3c08243 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -77,16 +77,7 @@ #define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k )) #endif -// FIXME: #warning "This hack is temporary...later remove it" -#ifndef TQT_CLEAN_NAMESPACE - #define TQT_CLEAN_NAMESPACE - #include <tqcursor.h> - #undef TQT_CLEAN_NAMESPACE -#else - #include <tqcursor.h> -#endif - - +#include <tqcursor.h> //This comes from kvi_app.cpp extern KviColorWindow * g_pColorWindow; diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index ec65b9c..8a37cd6 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -126,14 +126,7 @@ // FIXME: #warning "There are problems with the selection and wrapped lines: you can select something on the first line and get the second highlighted" // FIXME: #warning "This hack is temporary...later remove it" -#ifndef TQT_CLEAN_NAMESPACE - #define TQT_CLEAN_NAMESPACE - #include <tqcursor.h> - #undef TQT_CLEAN_NAMESPACE -#else - #include <tqcursor.h> -#endif - +#include <tqcursor.h> #include <tqclipboard.h> #include <tqdatetime.h> #include <tqmessagebox.h> |