From 3259610145b31e45dd140fb95db2e4d1f9d90c92 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 25 Sep 2023 13:37:05 +0900 Subject: Replace QObject, QWidget, QImage, QPair, QRgb, QColor, QChar, QString, QIODevice with TQ* version Signed-off-by: Michele Calgaro (cherry picked from commit 8a2b3d6ccafeb41579d50dccaec38febb9af6369) --- ark/rar.cpp | 2 +- kcalc/kcalc.kcfg | 2 +- kregexpeditor/qregexpparser.l | 56 +++++++++++++++---------------- kregexpeditor/qregexpparser.y | 14 ++++---- superkaramba/examples/openCloseTheme/1.py | 2 +- tdelirc/profiles/konqueror.profile.xml | 2 +- tdelirc/profiles/profile.dtd | 2 +- tdelirc/profiles/tdelauncher.profile.xml | 4 +-- 8 files changed, 42 insertions(+), 42 deletions(-) diff --git a/ark/rar.cpp b/ark/rar.cpp index 3c5d8fa..fd049bd 100644 --- a/ark/rar.cpp +++ b/ark/rar.cpp @@ -126,7 +126,7 @@ bool RarArch::processLine( const TQCString &line ) } TQStringList entry; - TQStringList parsedData = TQStringList::split(QChar(' '), uline); + TQStringList parsedData = TQStringList::split(TQChar(' '), uline); if (m_version < VERSION_5) { if (m_isFirstLine) diff --git a/kcalc/kcalc.kcfg b/kcalc/kcalc.kcfg index 2192df3..f098654 100644 --- a/kcalc/kcalc.kcfg +++ b/kcalc/kcalc.kcfg @@ -18,7 +18,7 @@ - QColor defaultButtonColor = kapp->palette().active().background(); + TQColor defaultButtonColor = kapp->palette().active().background(); defaultButtonColor diff --git a/kregexpeditor/qregexpparser.l b/kregexpeditor/qregexpparser.l index 8831bb6..ad0e416 100644 --- a/kregexpeditor/qregexpparser.l +++ b/kregexpeditor/qregexpparser.l @@ -76,20 +76,20 @@ SpecialEsc \\[afnrtv] } {SpecialEsc} { TextRangeRegExp* regexp = new TextRangeRegExp( false ); - regexp->addCharacter( QString::fromLocal8Bit( yytext ) ); + regexp->addCharacter( TQString::fromLocal8Bit( yytext ) ); qregexplval.regexp = regexp; return TOK_CharClass; } {HexChar} { TextRangeRegExp* regexp = new TextRangeRegExp( false ); - regexp->addCharacter( QString::fromLocal8Bit(yytext) ); + regexp->addCharacter( TQString::fromLocal8Bit(yytext) ); qregexplval.regexp = regexp; return TOK_CharClass; } {OctChar} { TextRangeRegExp* regexp = new TextRangeRegExp( false ); - regexp->addCharacter( QString::fromLocal8Bit(yytext) ); + regexp->addCharacter( TQString::fromLocal8Bit(yytext) ); qregexplval.regexp = regexp; return TOK_CharClass; } @@ -113,7 +113,7 @@ SpecialEsc \\[afnrtv] %% -void setParseData( QString qstr ) { +void setParseData( TQString qstr ) { const char* cstr; if ( qstr.isNull() ) cstr = ""; @@ -176,18 +176,18 @@ void parseRange( char* txt, int* min, int* max ) RegExp* parseCharClass( char* match ) { TextRangeRegExp* res = new TextRangeRegExp( false ); - QString txt = QString::fromLocal8Bit( match ); + TQString txt = TQString::fromLocal8Bit( match ); txt = txt.mid(1,txt.length()-2); unsigned int i = 0; - QChar ch = txt.at(i++); - QString pendingChar; - QString thisChar; + TQChar ch = txt.at(i++); + TQString pendingChar; + TQString thisChar; bool charPending = false; bool rangePending = false; bool flushPending = false; - if ( ch == QChar('^') ) { + if ( ch == TQChar('^') ) { res->setNegate( true ); ch = txt.at(i++); } @@ -195,7 +195,7 @@ RegExp* parseCharClass( char* match ) do { // If a character is pending, and the next char is '-' then we are // possible looking at a range. - if ( ch == QChar('-') && charPending ) { + if ( ch == TQChar('-') && charPending ) { rangePending = true; ch = txt.at(i++); continue; @@ -209,44 +209,44 @@ RegExp* parseCharClass( char* match ) charPending = false; } - if ( ch == QChar('\\') ) { + if ( ch == TQChar('\\') ) { // Handle the cases where an escape character is specified. ch = txt.at(i++); - if ( ch == QChar('a') || ch == QChar('f') || ch == QChar('n') || ch == QChar('r') || ch == QChar('t') || ch == QChar('v') ) { + if ( ch == TQChar('a') || ch == TQChar('f') || ch == TQChar('n') || ch == TQChar('r') || ch == TQChar('t') || ch == TQChar('v') ) { // These are just seen as normal characters. - thisChar = QString::fromLocal8Bit("\\") + ch; + thisChar = TQString::fromLocal8Bit("\\") + ch; } - else if ( ch == QChar('d') ) { + else if ( ch == TQChar('d') ) { // The following characters represent character groups. If any of // these are seen in a range, then the range is ignored, thus [a-\s] // matches an 'a', a '-', and a space (\s means space). res->setDigit( true ); flushPending = true; } - else if ( ch == QChar('D') ) { + else if ( ch == TQChar('D') ) { res->setNonDigit( true ); flushPending = true; } - else if ( ch == QChar('s') ) { + else if ( ch == TQChar('s') ) { res->setSpace( true ); flushPending = true; } - else if ( ch == QChar('S') ) { + else if ( ch == TQChar('S') ) { res->setNonSpace( true ); flushPending = true; } - else if ( ch == QChar('w') ) { + else if ( ch == TQChar('w') ) { res->setWordChar( true ); flushPending = true; } - else if ( ch == QChar('W') ) { + else if ( ch == TQChar('W') ) { res->setNonWordChar( true ); flushPending = true; } - else if ( ch == QChar('x') || ch == QChar('X') ) { + else if ( ch == TQChar('x') || ch == TQChar('X') ) { // This is a hexidecimal character: \xHHHH - QString str; + TQString str; for ( int j=0; j<4; j++) { ch = txt.at(i++); if ( ch == 'a' || ch == 'A' || ch == 'b' || ch == 'B' || ch == 'c' || ch == 'C' || ch == 'd' || ch == 'D' || @@ -257,11 +257,11 @@ RegExp* parseCharClass( char* match ) else i--; } - thisChar = QString::fromLocal8Bit("\\x") + str; + thisChar = TQString::fromLocal8Bit("\\x") + str; } - else if ( ch == QChar('0') ) { + else if ( ch == TQChar('0') ) { // This is an octal character - QString str; + TQString str; for ( int j=0; j<4; j++) { ch = txt.at(i++); if ( ch == '0' || ch == '1' || ch == '2' || ch == '3' || ch == '4' || ch == '5' || ch == '6' || ch == '7' ) @@ -269,7 +269,7 @@ RegExp* parseCharClass( char* match ) else i--; } - thisChar = QString::fromLocal8Bit("\\x") + str ; + thisChar = TQString::fromLocal8Bit("\\x") + str ; } else { // Anything else escaped just means the character itself. @@ -290,7 +290,7 @@ RegExp* parseCharClass( char* match ) if ( charPending ) res->addCharacter( pendingChar ); if ( rangePending ) - res->addCharacter( QString::fromLocal8Bit("-") ); + res->addCharacter( TQString::fromLocal8Bit("-") ); flushPending = false; charPending = false; rangePending = false; @@ -308,12 +308,12 @@ RegExp* parseCharClass( char* match ) } ch = txt.at(i++); } - while ( ch != QChar(']') && i <= txt.length() ); + while ( ch != TQChar(']') && i <= txt.length() ); if ( charPending ) res->addCharacter( pendingChar ); if ( rangePending ) - res->addCharacter( QString::fromLocal8Bit("-") ); + res->addCharacter( TQString::fromLocal8Bit("-") ); return res; } diff --git a/kregexpeditor/qregexpparser.y b/kregexpeditor/qregexpparser.y index 868c1dd..59e42b0 100644 --- a/kregexpeditor/qregexpparser.y +++ b/kregexpeditor/qregexpparser.y @@ -38,10 +38,10 @@ #include "compoundregexp.h" extern int yylex(); - extern void setParseData( QString str ); + extern void setParseData( TQString str ); int yyerror (const char *); void setParseResult( RegExp* ); - RegExp* parseQtRegExp( QString qstr, bool* ok ); + RegExp* parseQtRegExp( TQString qstr, bool* ok ); static RegExp* parseResult; static int _index; %} @@ -102,11 +102,11 @@ expression : expression TOK_Bar term { $$ = new AltnRegExp( false ); dynamic_cast( $$ )->addRegExp( $1 ); } - dynamic_cast( $$ )->addRegExp( new TextRegExp( false, QString::fromLatin1("") ) ); + dynamic_cast( $$ )->addRegExp( new TextRegExp( false, TQString::fromLatin1("") ) ); } | TOK_Bar term { $$ = new AltnRegExp( false ); - dynamic_cast( $$ )->addRegExp( new TextRegExp( false, QString::fromLatin1("") ) ); + dynamic_cast( $$ )->addRegExp( new TextRegExp( false, TQString::fromLatin1("") ) ); dynamic_cast( $$ )->addRegExp( $2 ); } | TOK_Bar { $$ = new AltnRegExp( false ); } @@ -155,7 +155,7 @@ atom : TOK_LeftParen expression TOK_RightParent { | TOK_Carat { $$ = new PositionRegExp( false, PositionRegExp::BEGLINE ); } | TOK_Dot { $$ = new DotRegExp( false ); } | TOK_BackRef { - QString match = TQString(TQString::fromLocal8Bit("\\%1")).arg( $1 ); + TQString match = TQString(TQString::fromLocal8Bit("\\%1")).arg( $1 ); $$ = new TextRegExp( false, match ); KMessageBox::information(0,i18n("Back reference regular expressions are not supported.

" "\\1, \\2, ... are back references, meaning they refer to " @@ -167,7 +167,7 @@ atom : TOK_LeftParen expression TOK_RightParent { "the back reference will be replaced by matching the text %2 literally.") .arg( match ).arg( match ), i18n("Back reference regular expressions not supported"), - QString::fromLocal8Bit("backReferenceNotSupported") ); + TQString::fromLocal8Bit("backReferenceNotSupported") ); } | TOK_PosWordChar { $$ = new PositionRegExp( false, PositionRegExp::WORDBOUNDARY ); } | TOK_PosNonWordChar { $$ = new PositionRegExp( false, PositionRegExp::NONWORDBOUNDARY ); } @@ -184,7 +184,7 @@ char : TOK_Char { %% -RegExp* parseQtRegExp( QString qstr, bool* ok ) { +RegExp* parseQtRegExp( TQString qstr, bool* ok ) { _index = 0; parseResult = 0; setParseData( qstr ); diff --git a/superkaramba/examples/openCloseTheme/1.py b/superkaramba/examples/openCloseTheme/1.py index 26281aa..fa659e0 100644 --- a/superkaramba/examples/openCloseTheme/1.py +++ b/superkaramba/examples/openCloseTheme/1.py @@ -1,7 +1,7 @@ import dcop import dcopext import karamba -from qt import QString, QCString +from qt import TQString, QCString def closeTheme(theme): dc = dcop.DCOPClient() diff --git a/tdelirc/profiles/konqueror.profile.xml b/tdelirc/profiles/konqueror.profile.xml index ab6ed8a..464ed52 100644 --- a/tdelirc/profiles/konqueror.profile.xml +++ b/tdelirc/profiles/konqueror.profile.xml @@ -5,7 +5,7 @@ Konqueror Gav Wood - + Create New Window Creates a new window and loads an arbitrary URL. The URL to load in the window initially. diff --git a/tdelirc/profiles/profile.dtd b/tdelirc/profiles/profile.dtd index 070fd14..96c60da 100644 --- a/tdelirc/profiles/profile.dtd +++ b/tdelirc/profiles/profile.dtd @@ -14,7 +14,7 @@ - + diff --git a/tdelirc/profiles/tdelauncher.profile.xml b/tdelirc/profiles/tdelauncher.profile.xml index 88475f2..be55dbd 100644 --- a/tdelirc/profiles/tdelauncher.profile.xml +++ b/tdelirc/profiles/tdelauncher.profile.xml @@ -3,13 +3,13 @@ TDE Program Launcher Gav Wood - + Execute Runs a program or script The executable name and path of the program or script to run Parameters for the program or script - + Execute and Wait Runs a program or script and waits for it to finish The executable name and path of the program or script to run -- cgit v1.2.1