summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-09-25 13:37:05 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-09-25 20:04:04 +0900
commit3259610145b31e45dd140fb95db2e4d1f9d90c92 (patch)
tree804f19bf98dc1cf41b0e7ddcb3180293acbef8d3
parentcc39f08938ba6336c0d7f54047a3578dc5310cfc (diff)
downloadtdeutils-3259610145b31e45dd140fb95db2e4d1f9d90c92.tar.gz
tdeutils-3259610145b31e45dd140fb95db2e4d1f9d90c92.zip
Replace QObject, QWidget, QImage, QPair, QRgb, QColor, QChar, QString, QIODevice with TQ* versionr14.1.1
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 8a2b3d6ccafeb41579d50dccaec38febb9af6369)
-rw-r--r--ark/rar.cpp2
-rw-r--r--kcalc/kcalc.kcfg2
-rw-r--r--kregexpeditor/qregexpparser.l56
-rw-r--r--kregexpeditor/qregexpparser.y14
-rw-r--r--superkaramba/examples/openCloseTheme/1.py2
-rw-r--r--tdelirc/profiles/konqueror.profile.xml2
-rw-r--r--tdelirc/profiles/profile.dtd2
-rw-r--r--tdelirc/profiles/tdelauncher.profile.xml4
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 @@
</entry>
<entry name="NumberButtonsColor" type="Color">
<label>The color of number buttons.</label>
- <code>QColor defaultButtonColor = kapp->palette().active().background();</code>
+ <code>TQColor defaultButtonColor = kapp->palette().active().background();</code>
<default code="true">defaultButtonColor</default>
</entry>
<entry name="FunctionButtonsColor" type="Color">
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 {
$<regexp>$ = new AltnRegExp( false );
dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( $<regexp>1 );
}
- dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( new TextRegExp( false, QString::fromLatin1("") ) );
+ dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( new TextRegExp( false, TQString::fromLatin1("") ) );
}
| TOK_Bar term {
$<regexp>$ = new AltnRegExp( false );
- dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( new TextRegExp( false, QString::fromLatin1("") ) );
+ dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( new TextRegExp( false, TQString::fromLatin1("") ) );
dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( $<regexp>2 );
}
| TOK_Bar { $<regexp>$ = new AltnRegExp( false ); }
@@ -155,7 +155,7 @@ atom : TOK_LeftParen expression TOK_RightParent {
| TOK_Carat { $<regexp>$ = new PositionRegExp( false, PositionRegExp::BEGLINE ); }
| TOK_Dot { $<regexp>$ = new DotRegExp( false ); }
| TOK_BackRef {
- QString match = TQString(TQString::fromLocal8Bit("\\%1")).arg( $<backRef>1 );
+ TQString match = TQString(TQString::fromLocal8Bit("\\%1")).arg( $<backRef>1 );
$<regexp>$ = new TextRegExp( false, match );
KMessageBox::information(0,i18n("<qt>Back reference regular expressions are not supported.<p>"
"<tt>\\1</tt>, <tt>\\2</tt>, ... are <i>back references</i>, meaning they refer to "
@@ -167,7 +167,7 @@ atom : TOK_LeftParen expression TOK_RightParent {
"the back reference will be replaced by matching the text <b>%2</b> literally.")
.arg( match ).arg( match ),
i18n("Back reference regular expressions not supported"),
- QString::fromLocal8Bit("backReferenceNotSupported") );
+ TQString::fromLocal8Bit("backReferenceNotSupported") );
}
| TOK_PosWordChar { $<regexp>$ = new PositionRegExp( false, PositionRegExp::WORDBOUNDARY ); }
| TOK_PosNonWordChar { $<regexp>$ = 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 @@
<name>Konqueror</name>
<author>Gav Wood</author>
<instances uniqueapp="0" ifmulti="sendtotop"/>
- <action objid="KonquerorIface" prototype="void createNewWindow(QString)" repeat="0" autostart="0">
+ <action objid="KonquerorIface" prototype="void createNewWindow(TQString)" repeat="0" autostart="0">
<name>Create New Window</name>
<comment>Creates a new window and loads an arbitrary URL.</comment>
<argument type="TQString"><comment>The URL to load in the window initially.</comment></argument>
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 @@
<!ATTLIST profile servicename CDATA #REQUIRED>
<!ATTLIST action objid CDATA #REQUIRED>
<!ATTLIST action prototype CDATA #REQUIRED>
-<!ATTLIST argument type (int|QString|QCString|QStringList|bool|double) #REQUIRED>
+<!ATTLIST argument type (int|TQString|QCString|QStringList|bool|double) #REQUIRED>
<!ATTLIST range min CDATA #REQUIRED>
<!ATTLIST range max CDATA #REQUIRED>
<!ATTLIST action class (captions|teletext|fullscreen|scan|finetuneup|finetunedown|recall|enter|number|play|stop|pause|record|previous|next|rewind|forward|eject|mute|volumedown|volumeup|channeldown|channelup|red|yellow|green|blue|on|off) #IMPLIED>
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 @@
<profile id="tdelauncher">
<name>TDE Program Launcher</name>
<author>Gav Wood</author>
- <action objid="default" prototype="void tdeinit_exec(QString, QStringList)" repeat="0" autostart="0">
+ <action objid="default" prototype="void tdeinit_exec(TQString, QStringList)" repeat="0" autostart="0">
<name>Execute</name>
<comment>Runs a program or script</comment>
<argument type="TQString"><comment>The executable name and path of the program or script to run</comment></argument>
<argument type="TQStringList"><comment>Parameters for the program or script</comment></argument>
</action>
- <action objid="default" prototype="void tdeinit_exec_wait(QString, QStringList)" repeat="0" autostart="0">
+ <action objid="default" prototype="void tdeinit_exec_wait(TQString, QStringList)" repeat="0" autostart="0">
<name>Execute and Wait</name>
<comment>Runs a program or script and waits for it to finish</comment>
<argument type="TQString"><comment>The executable name and path of the program or script to run</comment></argument>