diff options
Diffstat (limited to 'tools/linguist')
-rw-r--r-- | tools/linguist/book/linguist-programmer.leaf | 20 | ||||
-rw-r--r-- | tools/linguist/linguist/finddialog.h | 2 | ||||
-rw-r--r-- | tools/linguist/linguist/msgedit.h | 6 | ||||
-rw-r--r-- | tools/linguist/linguist/phrasebookbox.h | 2 | ||||
-rw-r--r-- | tools/linguist/linguist/phraselv.h | 2 | ||||
-rw-r--r-- | tools/linguist/linguist/simtexth.cpp | 2 | ||||
-rw-r--r-- | tools/linguist/linguist/trwindow.cpp | 10 | ||||
-rw-r--r-- | tools/linguist/linguist/trwindow.h | 2 | ||||
-rw-r--r-- | tools/linguist/lrelease/main.cpp | 2 | ||||
-rw-r--r-- | tools/linguist/lupdate/fetchtr.cpp | 36 | ||||
-rw-r--r-- | tools/linguist/lupdate/main.cpp | 2 | ||||
-rw-r--r-- | tools/linguist/lupdate/numberh.cpp | 2 | ||||
-rw-r--r-- | tools/linguist/qdoc.conf | 2 | ||||
-rw-r--r-- | tools/linguist/qm2ts/main.cpp | 2 | ||||
-rw-r--r-- | tools/linguist/tutorial/tt2/arrowpad.h | 2 | ||||
-rw-r--r-- | tools/linguist/tutorial/tt2/mainwindow.h | 2 | ||||
-rw-r--r-- | tools/linguist/tutorial/tt3/mainwindow.h | 2 | ||||
-rw-r--r-- | tools/linguist/tutorial/tt3/printpanel.h | 2 |
18 files changed, 50 insertions, 50 deletions
diff --git a/tools/linguist/book/linguist-programmer.leaf b/tools/linguist/book/linguist-programmer.leaf index ecf2689a5..771fff592 100644 --- a/tools/linguist/book/linguist-programmer.leaf +++ b/tools/linguist/book/linguist-programmer.leaf @@ -130,9 +130,9 @@ would become button = new QPushButton( tr("&Quit"), this); \endcode -\index Q_OBJECT +\index TQ_OBJECT -All \l QObject subclasses that use the \c Q_OBJECT macro implement +All \l QObject subclasses that use the \c TQ_OBJECT macro implement the \c tr() function. Although the \c tr() call is normally made directly since it is @@ -581,7 +581,7 @@ version}, above, the central widget with the four buttons is an \skipto class ArrowPad \printline class ArrowPad -\index Q_OBJECT +\index TQ_OBJECT \index tr() \index QObject!tr() \index Translation Contexts @@ -591,7 +591,7 @@ When \l lupdate is run it not only extracts the source texts but it also groups them into contexts. A context is the name of the class in which the source text appears. Thus, in this example, "ArrowPad" is a context: it is the context of the texts in the \c ArrowPad class. -The \c Q_OBJECT macro defines \c tr(x) in \c ArrowPad like this +The \c TQ_OBJECT macro defines \c tr(x) in \c ArrowPad like this \index QApplication!translate() \index translate()!QApplication @@ -623,17 +623,17 @@ user-visible text. \img tt2_en.png \caption Tutorial 2 Screenshot, English version -\index Q_OBJECT +\index TQ_OBJECT \index MainWindow!in Translation Tutorial \quotefile tt2/mainwindow.h \skipto QMainWindow \printline QMainWindow -\printuntil Q_OBJECT +\printuntil TQ_OBJECT In the \e {Tutorial 2 Screenshot, English version}, above, the whole window is a \c MainWindow. This is defined in the \c mainwindow.h -header file. Here too, we use \c Q_OBJECT, so that \c MainWindow will +header file. Here too, we use \c TQ_OBJECT, so that \c MainWindow will become a context in \e {Qt Linguist}. In the implementation of \c MainWindow, \c mainwindow.cpp, we create @@ -850,13 +850,13 @@ The PrintPanel is defined in \c printpanel.h. \quotefile tt3/printpanel.h \skipto QVBox \printline QVBox -\printuntil Q_OBJECT +\printuntil TQ_OBJECT -\index Q_OBJECT +\index TQ_OBJECT \index PrintPanel!in Translation Tutorial -PrintPanel is a \l QWidget. It needs the \c Q_OBJECT macro for \c +PrintPanel is a \l QWidget. It needs the \c TQ_OBJECT macro for \c tr() to work properly. The implementation file is \c printpanel.cpp. diff --git a/tools/linguist/linguist/finddialog.h b/tools/linguist/linguist/finddialog.h index 43c7b589b..c2576002e 100644 --- a/tools/linguist/linguist/finddialog.h +++ b/tools/linguist/linguist/finddialog.h @@ -41,7 +41,7 @@ class TQLineEdit; class FindDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: enum { SourceText = 0x1, Translations = 0x2, Comments = 0x4 }; diff --git a/tools/linguist/linguist/msgedit.h b/tools/linguist/linguist/msgedit.h index a85bc1dd3..b1cfd9442 100644 --- a/tools/linguist/linguist/msgedit.h +++ b/tools/linguist/linguist/msgedit.h @@ -63,7 +63,7 @@ class PhraseLV; class PageCurl : public TQWidget { - Q_OBJECT + TQ_OBJECT public: PageCurl( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) @@ -125,7 +125,7 @@ private: class EditorPage : public TQFrame { - Q_OBJECT + TQ_OBJECT public: EditorPage( TQWidget * parent = 0, const char * name = 0 ); @@ -157,7 +157,7 @@ signals: class MessageEditor : public TQWidget { - Q_OBJECT + TQ_OBJECT public: MessageEditor( MetaTranslator * t, TQWidget * parent = 0, const char * name = 0 ); diff --git a/tools/linguist/linguist/phrasebookbox.h b/tools/linguist/linguist/phrasebookbox.h index a48d40c02..99edb9f81 100644 --- a/tools/linguist/linguist/phrasebookbox.h +++ b/tools/linguist/linguist/phrasebookbox.h @@ -47,7 +47,7 @@ class PhraseLV; class PhraseBookBox : public TQDialog { - Q_OBJECT + TQ_OBJECT public: PhraseBookBox( const TQString& filename, const PhraseBook& phraseBook, TQWidget *parent = 0, const char *name = 0, diff --git a/tools/linguist/linguist/phraselv.h b/tools/linguist/linguist/phraselv.h index 8135b43e3..e2e7ee19b 100644 --- a/tools/linguist/linguist/phraselv.h +++ b/tools/linguist/linguist/phraselv.h @@ -69,7 +69,7 @@ private: class PhraseLV : public TQListView { - Q_OBJECT + TQ_OBJECT public: PhraseLV( TQWidget *parent, const char *name ); ~PhraseLV(); diff --git a/tools/linguist/linguist/simtexth.cpp b/tools/linguist/linguist/simtexth.cpp index 931ba1377..8d6182210 100644 --- a/tools/linguist/linguist/simtexth.cpp +++ b/tools/linguist/linguist/simtexth.cpp @@ -191,7 +191,7 @@ CandidateList similarTextHeuristicCandidates( const MetaTranslator *tor, TQValueList<int> scores; CandidateList candidates; CoMatrix cmTarget( text ); - int targetLen = qstrlen( text ); + int targetLen = tqstrlen( text ); TML all = tor->translatedMessages(); TML::Iterator it; diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp index e174edc50..d044ca699 100644 --- a/tools/linguist/linguist/trwindow.cpp +++ b/tools/linguist/linguist/trwindow.cpp @@ -859,7 +859,7 @@ void TrWindow::manual() void TrWindow::about() { AboutDialog about( this, 0, TRUE ); - about.versionLabel->setText( tr("Version %1").arg(QT_VERSION_STR) ); + about.versionLabel->setText( tr("Version %1").arg(TQT_VERSION_STR) ); about.exec(); } @@ -1847,8 +1847,8 @@ bool TrWindow::danger( const TQString& source, const TQString& translation, void TrWindow::readConfig() { TQString keybase( "/TQt Linguist/" + - TQString::number( (QT_VERSION >> 16) & 0xff ) + - "." + TQString::number( (QT_VERSION >> 8) & 0xff ) + "/" ); + TQString::number( (TQT_VERSION >> 16) & 0xff ) + + "." + TQString::number( (TQT_VERSION >> 8) & 0xff ) + "/" ); TQSettings config; config.insertSearchPath( TQSettings::Windows, "/Trolltech" ); @@ -1918,8 +1918,8 @@ void TrWindow::readConfig() void TrWindow::writeConfig() { TQString keybase( "/TQt Linguist/" + - TQString::number( (QT_VERSION >> 16) & 0xff ) + - "." + TQString::number( (QT_VERSION >> 8) & 0xff ) + "/" ); + TQString::number( (TQT_VERSION >> 16) & 0xff ) + + "." + TQString::number( (TQT_VERSION >> 8) & 0xff ) + "/" ); TQSettings config; config.insertSearchPath( TQSettings::Windows, "/Trolltech" ); diff --git a/tools/linguist/linguist/trwindow.h b/tools/linguist/linguist/trwindow.h index af20b4873..82fc4ec10 100644 --- a/tools/linguist/linguist/trwindow.h +++ b/tools/linguist/linguist/trwindow.h @@ -63,7 +63,7 @@ class Statistics; class TrWindow : public TQMainWindow { - Q_OBJECT + TQ_OBJECT public: static TQPixmap * pxOn; static TQPixmap * pxOff; diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp index 9dc6b07eb..587f62104 100644 --- a/tools/linguist/lrelease/main.cpp +++ b/tools/linguist/lrelease/main.cpp @@ -120,7 +120,7 @@ int main( int argc, char **argv ) verbose = TRUE; continue; } else if ( qstrcmp(argv[i], "-version") == 0 ) { - fprintf( stderr, "lrelease version %s\n", QT_VERSION_STR ); + fprintf( stderr, "lrelease version %s\n", TQT_VERSION_STR ); return 0; } else if ( qstrcmp(argv[i], "-qm") == 0 ) { if ( i == argc - 1 ) { diff --git a/tools/linguist/lupdate/fetchtr.cpp b/tools/linguist/lupdate/fetchtr.cpp index a557fd518..7201f3a0e 100644 --- a/tools/linguist/lupdate/fetchtr.cpp +++ b/tools/linguist/lupdate/fetchtr.cpp @@ -45,12 +45,12 @@ #include <stdio.h> #include <string.h> -/* qmake ignore Q_OBJECT */ +/* qmake ignore TQ_OBJECT */ static const char MagicComment[] = "TRANSLATOR "; -static TQMap<TQCString, int> needs_Q_OBJECT; -static TQMap<TQCString, int> lacks_Q_OBJECT; +static TQMap<TQCString, int> needs_TQ_OBJECT; +static TQMap<TQCString, int> lacks_TQ_OBJECT; /* The first part of this source file is the C++ tokenizer. We skip @@ -75,7 +75,7 @@ static TQMap<TQCString, int> lacks_Q_OBJECT; */ enum { Tok_Eof, Tok_class, Tok_namespace, Tok_return, Tok_tr, - Tok_trUtf8, Tok_translate, Tok_Q_OBJECT, Tok_Ident, + Tok_trUtf8, Tok_translate, Tok_TQ_OBJECT, Tok_Ident, Tok_Comment, Tok_String, Tok_Arrow, Tok_Colon, Tok_Gulbrandsen, Tok_LeftBrace, Tok_RightBrace, Tok_LeftParen, Tok_RightParen, Tok_Comma, Tok_Semicolon }; @@ -167,7 +167,7 @@ static int getToken() switch ( yyIdent[0] ) { case 'Q': if ( strcmp(yyIdent + 1, "_OBJECT") == 0 ) { - return Tok_Q_OBJECT; + return Tok_TQ_OBJECT; } else if ( strcmp(yyIdent + 1, "T_TR_NOOP") == 0 ) { return Tok_tr; } else if ( strcmp(yyIdent + 1, "T_TRANSLATE_NOOP") == 0 ) { @@ -480,7 +480,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, TQCString functionContext = initialContext; TQCString prefix; bool utf8 = FALSE; - bool missing_Q_OBJECT = FALSE; + bool missing_TQ_OBJECT = FALSE; yyTok = getToken(); while ( yyTok != Tok_Eof ) { @@ -511,7 +511,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, } if ( yyTok == Tok_Colon ) { - missing_Q_OBJECT = TRUE; + missing_TQ_OBJECT = TRUE; } else { functionContext = defaultContext; } @@ -550,13 +550,13 @@ static void parse( MetaTranslator *tor, const char *initialContext, tor->insert( MetaTranslatorMessage(context, text, com, TQString::null, utf8) ); - if ( lacks_Q_OBJECT.contains(context) ) { - qWarning( "%s:%d: Class '%s' lacks Q_OBJECT macro", + if ( lacks_TQ_OBJECT.contains(context) ) { + qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro", (const char *) yyFileName, yyLineNo, (const char *) context ); - lacks_Q_OBJECT.remove( context ); + lacks_TQ_OBJECT.remove( context ); } else { - needs_Q_OBJECT.insert( context, 0 ); + needs_TQ_OBJECT.insert( context, 0 ); } } } @@ -580,8 +580,8 @@ static void parse( MetaTranslator *tor, const char *initialContext, TQString::null, utf8) ); } break; - case Tok_Q_OBJECT: - missing_Q_OBJECT = FALSE; + case Tok_TQ_OBJECT: + missing_TQ_OBJECT = FALSE; yyTok = getToken(); break; case Tok_Ident: @@ -637,17 +637,17 @@ static void parse( MetaTranslator *tor, const char *initialContext, yyBraceDepth + 1 == (int) namespaces.count() ) namespaces.remove( namespaces.fromLast() ); if ( yyBraceDepth == (int) namespaces.count() ) { - if ( missing_Q_OBJECT ) { - if ( needs_Q_OBJECT.contains(functionContext) ) { - qWarning( "%s:%d: Class '%s' lacks Q_OBJECT macro", + if ( missing_TQ_OBJECT ) { + if ( needs_TQ_OBJECT.contains(functionContext) ) { + qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro", (const char *) yyFileName, yyLineNo, (const char *) functionContext ); } else { - lacks_Q_OBJECT.insert( functionContext, 0 ); + lacks_TQ_OBJECT.insert( functionContext, 0 ); } } functionContext = defaultContext; - missing_Q_OBJECT = FALSE; + missing_TQ_OBJECT = FALSE; } yyTok = getToken(); break; diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp index 7c933afed..1e7225081 100644 --- a/tools/linguist/lupdate/main.cpp +++ b/tools/linguist/lupdate/main.cpp @@ -126,7 +126,7 @@ int main( int argc, char **argv ) verbose = TRUE; continue; } else if ( qstrcmp(argv[i], "-version") == 0 ) { - fprintf( stderr, "lupdate version %s\n", QT_VERSION_STR ); + fprintf( stderr, "lupdate version %s\n", TQT_VERSION_STR ); return 0; } else if ( qstrcmp(argv[i], "-ts") == 0 ) { metTsFlag = TRUE; diff --git a/tools/linguist/lupdate/numberh.cpp b/tools/linguist/lupdate/numberh.cpp index 52593b59e..29d6fd2f9 100644 --- a/tools/linguist/lupdate/numberh.cpp +++ b/tools/linguist/lupdate/numberh.cpp @@ -98,7 +98,7 @@ static TQString translationAttempt( const TQString& oldTranslation, const char *newSource ) { int p = zeroKey( oldSource ).contains( '0' ); - int oldSourceLen = qstrlen( oldSource ); + int oldSourceLen = tqstrlen( oldSource ); TQString attempt; TQStringList oldNumbers; TQStringList newNumbers; diff --git a/tools/linguist/qdoc.conf b/tools/linguist/qdoc.conf index 86e6066e4..27ba5efe8 100644 --- a/tools/linguist/qdoc.conf +++ b/tools/linguist/qdoc.conf @@ -5,7 +5,7 @@ OUTPUTDIR = $QTDIR/tools/linguist/doc/html BASE = file:$QTDIR/tools/linguist/doc/html/ COMPANY = Trolltech PRODUCT = TQt Linguist -VERSIONSYM = QT_VERSION_STR +VERSIONSYM = TQT_VERSION_STR DEFINE = QT_QDOC QT_.*_SUPPORT _WS_.*_ FALSE = 0 1 INTERNAL = no diff --git a/tools/linguist/qm2ts/main.cpp b/tools/linguist/qm2ts/main.cpp index c32c5248d..7c30167ae 100644 --- a/tools/linguist/qm2ts/main.cpp +++ b/tools/linguist/qm2ts/main.cpp @@ -64,7 +64,7 @@ int main( int argc, char **argv ) verbose = TRUE; continue; } else if ( qstrcmp(argv[i], "-version") == 0 ) { - fprintf( stderr, "qm2ts version %s\n", QT_VERSION_STR ); + fprintf( stderr, "qm2ts version %s\n", TQT_VERSION_STR ); return 0; } diff --git a/tools/linguist/tutorial/tt2/arrowpad.h b/tools/linguist/tutorial/tt2/arrowpad.h index c973523bb..e0d304922 100644 --- a/tools/linguist/tutorial/tt2/arrowpad.h +++ b/tools/linguist/tutorial/tt2/arrowpad.h @@ -11,7 +11,7 @@ class ArrowPad : public TQGrid { - Q_OBJECT + TQ_OBJECT public: ArrowPad( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tools/linguist/tutorial/tt2/mainwindow.h b/tools/linguist/tutorial/tt2/mainwindow.h index 0a190af08..92ecf61c7 100644 --- a/tools/linguist/tutorial/tt2/mainwindow.h +++ b/tools/linguist/tutorial/tt2/mainwindow.h @@ -11,7 +11,7 @@ class MainWindow : public TQMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWindow( TQWidget *parent = 0, const char *name = 0 ); }; diff --git a/tools/linguist/tutorial/tt3/mainwindow.h b/tools/linguist/tutorial/tt3/mainwindow.h index c0b5812fb..2007658eb 100644 --- a/tools/linguist/tutorial/tt3/mainwindow.h +++ b/tools/linguist/tutorial/tt3/mainwindow.h @@ -11,7 +11,7 @@ class MainWindow : public TQMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWindow( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tools/linguist/tutorial/tt3/printpanel.h b/tools/linguist/tutorial/tt3/printpanel.h index 565b7b629..2c7d34a6b 100644 --- a/tools/linguist/tutorial/tt3/printpanel.h +++ b/tools/linguist/tutorial/tt3/printpanel.h @@ -11,7 +11,7 @@ class PrintPanel : public TQVBox { - Q_OBJECT + TQ_OBJECT public: PrintPanel( TQWidget *parent = 0, const char *name = 0 ); }; |