diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-24 03:10:05 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-24 03:10:05 -0500 |
| commit | 5ee7b67829cd6083b95dc26804f446ec6d75ebcc (patch) | |
| tree | 68c1b2d23692332c78517b80eda32bf3cbe995b5 /experimental/tqtinterface/qt4/src/kernel/tqinputcontext.h | |
| parent | 2f4ee8ef5d1fe9a8daa9d342d71b021e6a25ca01 (diff) | |
| download | tde-5ee7b67829cd6083b95dc26804f446ec6d75ebcc.tar.gz tde-5ee7b67829cd6083b95dc26804f446ec6d75ebcc.zip | |
Fixed FTBFS due to prior commit
Diffstat (limited to 'experimental/tqtinterface/qt4/src/kernel/tqinputcontext.h')
| -rw-r--r-- | experimental/tqtinterface/qt4/src/kernel/tqinputcontext.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.h b/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.h index 9dbd9bfd2..14a1a7e25 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqinputcontext.h @@ -43,13 +43,8 @@ #include "tqglobal.h" #include "tqevent.h" #include "tqstring.h" -#if ([[[TQT_VERSION IS DEPRECATED]]]-0 >= 0x040000) -#include "tqlist.h" -#include "tqaction.h" -#else #include "tqptrlist.h" #endif -#endif class TQWidget; class TQFont; @@ -62,15 +57,14 @@ struct TQInputContextMenu { NoSeparator, InsertSeparator }; -#if !([[[TQT_VERSION IS DEPRECATED]]]-0 >= 0x040000) TQString title; TQPopupMenu *popup; -#endif }; class TQInputContext : public TQObject { + Q_OBJECT TQ_OBJECT public: TQInputContext( TQObject *tqparent = 0 ); @@ -94,13 +88,8 @@ public: virtual bool isComposing() const; virtual bool isPreeditRelocationEnabled(); -#if ([[[TQT_VERSION IS DEPRECATED]]]-0 >= 0x040000) - virtual TQList<TQAction *> actions(); - void addActionsTo( TQMenu *menu, TQInputContextMenu::Action action = TQInputContextMenu::InsertSeparator ); -#else virtual TQPtrList<TQInputContextMenu> *menus(); void addMenusTo( TQPopupMenu *popup, TQInputContextMenu::Action action = TQInputContextMenu::InsertSeparator ); -#endif #if defined(TQ_WS_X11) // these functions are not recommended for ordinary use |