diff options
| -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 1d5f12b8..3c082436 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 ec65b9c3..8a37cd68 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> |