From d3fa742c69aff07a76e7d21325b83401089eeb2b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 20 Oct 2012 21:33:08 -0500 Subject: [PATCH] Update TQt3 property/enum macros --- kbabel/commonui/kactionselector.h | 2 +- scripts/kde-devel-vim.vim | 2 +- umbrello/umbrello/codeimport/kdevcppparser/driver.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kbabel/commonui/kactionselector.h b/kbabel/commonui/kactionselector.h index 8e401718..3a13303b 100644 --- a/kbabel/commonui/kactionselector.h +++ b/kbabel/commonui/kactionselector.h @@ -87,7 +87,7 @@ class KActionSelectorPrivate; class KActionSelector : public TQWidget { Q_OBJECT - Q_ENUMS( ButtonIconSize InsertionPolicy ) + TQ_ENUMS( ButtonIconSize InsertionPolicy ) TQ_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick ) TQ_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled ) TQ_PROPERTY( TQString availableLabel READ availableLabel WRITE setAvailableLabel ) diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim index 765fd39c..40ad4186 100644 --- a/scripts/kde-devel-vim.vim +++ b/scripts/kde-devel-vim.vim @@ -384,7 +384,7 @@ endfunction function! AddQtSyntax() if expand( "" ) == "cpp" syn keyword qtKeywords Q_SIGNALS Q_SLOTS emit foreach - syn keyword qtMacros Q_OBJECT Q_WIDGET Q_PROPERTY Q_ENUMS Q_OVERRIDE Q_CLASSINFO Q_SETS SIGNAL SLOT + syn keyword qtMacros Q_OBJECT Q_WIDGET TQ_PROPERTY TQ_ENUMS TQ_OVERRIDE TQ_CLASSINFO TQ_SETS SIGNAL SLOT syn keyword qtCast qt_cast qobject_cast qvariant_cast qstyleoption_cast syn keyword qtTypedef uchar uint ushort ulong TQ_INT8 TQ_UINT8 TQ_INT16 TQ_UINT16 TQ_INT32 TQ_UINT32 TQ_LONG TQ_ULONG TQ_INT64 TQ_UINT64 TQ_LLONG TQ_ULLONG pchar puchar pcchar qint8 quint8 qint16 quint16 qint32 quint32 qint64 quint64 qlonglong qulonglong syn keyword kdeKeywords k_dcop k_dcop_Q_SIGNALS diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp index d3c8a1df..b3a7329c 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp @@ -326,7 +326,7 @@ void Driver::setupLexer( Lexer * lexer ) // qt lexer->addSkipWord( "TQ_OVERRIDE", SkipWordAndArguments ); - lexer->addSkipWord( "Q_ENUMS", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_ENUMS", SkipWordAndArguments ); lexer->addSkipWord( "TQ_PROPERTY", SkipWordAndArguments ); lexer->addSkipWord( "TQ_CLASSINFO", SkipWordAndArguments ); lexer->addSkipWord( "TQ_SETS", SkipWordAndArguments );