diff options
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/ntqinputcontext.h | 7 | ||||
| -rw-r--r-- | src/kernel/qinputcontext.cpp | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h index 2cb7785e..bb8a4f9f 100644 --- a/src/kernel/ntqinputcontext.h +++ b/src/kernel/ntqinputcontext.h @@ -43,13 +43,8 @@ #include "ntqglobal.h" #include "ntqevent.h" #include "ntqstring.h" -#if (TQT_VERSION-0 >= 0x040000) -#include "ntqlist.h" -#include "ntqaction.h" -#else #include "ntqptrlist.h" #endif -#endif class TQWidget; class TQFont; @@ -95,7 +90,7 @@ public: virtual bool isPreeditRelocationEnabled(); #if (TQT_VERSION-0 >= 0x040000) - virtual TQList<TQAction *> actions(); + virtual TQPtrList<TQAction *> actions(); void addActionsTo( TQMenu *menu, TQInputContextMenu::Action action = TQInputContextMenu::InsertSeparator ); #else virtual TQPtrList<TQInputContextMenu> *menus(); diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp index 9533d3eb..6523fe75 100644 --- a/src/kernel/qinputcontext.cpp +++ b/src/kernel/qinputcontext.cpp @@ -806,7 +806,7 @@ TQString TQInputContext::language() /*! This is a preliminary interface for TQt4 */ -TQList<TQAction *> TQInputContext::actions() +TQPtrList<TQAction *> TQInputContext::actions() { } #else |