summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-09-25 12:03:00 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-09-25 17:50:49 +0900
commit04d353236066b9aa85f6387fa05d3d37b75a7dd2 (patch)
tree3781200cbdb5db08e22cb07dd16c2dcdf6402b98 /tdecore
parentb0f1961286230520573e2433b0ed4562718ce7a3 (diff)
downloadtdelibs-04d353236066b9aa85f6387fa05d3d37b75a7dd2.tar.gz
tdelibs-04d353236066b9aa85f6387fa05d3d37b75a7dd2.zip
Replace QObject, QWidget, QImage, QPair, QRgb, QColor, QChar, QString, QIODevice with TQ* version
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 4c0dae60b2fbc60996fc8f4bd29ee6219b869527)
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/DESIGN.iconloading2
-rw-r--r--tdecore/DESIGN.tdeconfig2
-rw-r--r--tdecore/README.kiosk6
-rw-r--r--tdecore/kcharsets.cpp12
-rw-r--r--tdecore/kdebug.cpp8
-rw-r--r--tdecore/kextsock.h6
-rw-r--r--tdecore/kglobalaccel.h4
-rw-r--r--tdecore/kiconeffect.cpp18
-rw-r--r--tdecore/kiconloader.cpp6
-rw-r--r--tdecore/kidna.cpp4
-rw-r--r--tdecore/klibloader.h2
-rw-r--r--tdecore/kmacroexpander.cpp62
-rw-r--r--tdecore/kmanagerselection.cpp4
-rw-r--r--tdecore/krfcdate.cpp2
-rw-r--r--tdecore/ksavefile.cpp2
-rw-r--r--tdecore/kshell.cpp66
-rw-r--r--tdecore/kstandarddirs.cpp78
-rw-r--r--tdecore/kstringhandler.cpp6
-rw-r--r--tdecore/kurl.h2
-rw-r--r--tdecore/kurldrag.h4
-rw-r--r--tdecore/network/kresolver.cpp2
-rw-r--r--tdecore/network/kstreamsocket.cpp4
-rw-r--r--tdecore/network/tdesocketbase.h4
-rw-r--r--tdecore/tdeaccel.h8
-rw-r--r--tdecore/tdeaccelprivate.h2
-rw-r--r--tdecore/tdeapplication.h2
-rw-r--r--tdecore/tdecmdlineargs.cpp6
-rw-r--r--tdecore/tdeconfig_compiler/README.dox8
-rw-r--r--tdecore/tdeconfig_compiler/example/example.kcfg2
-rw-r--r--tdecore/tdeconfig_compiler/example/general_base.ui2
-rw-r--r--tdecore/tdeconfig_compiler/example/myoptions_base.ui2
-rw-r--r--tdecore/tdeconfigbase.cpp6
-rw-r--r--tdecore/tdeconfigdialogmanager.cpp2
-rw-r--r--tdecore/tdeglobal.cpp4
-rw-r--r--tdecore/tdeglobalsettings.cpp2
-rw-r--r--tdecore/tdelocale.cpp42
-rw-r--r--tdecore/tdestartupinfo.cpp10
-rw-r--r--tdecore/tdesycoca.cpp2
-rw-r--r--tdecore/tests/kdebugtest.cpp2
-rw-r--r--tdecore/twinmodule.h4
40 files changed, 206 insertions, 206 deletions
diff --git a/tdecore/DESIGN.iconloading b/tdecore/DESIGN.iconloading
index a675a8922..1a90f43ef 100644
--- a/tdecore/DESIGN.iconloading
+++ b/tdecore/DESIGN.iconloading
@@ -42,7 +42,7 @@ That way the application's pixmap always remain valid.
Some example code to get the idea:
Server can publish an icon (test.png) like this:
- QImage i("test.png");
+ TQImage i("test.png");
QPixmap p;
p.convertFromImage(i);
tqWarning("Handle = %08x", p.handle());
diff --git a/tdecore/DESIGN.tdeconfig b/tdecore/DESIGN.tdeconfig
index a1fb48dbd..ef8c40546 100644
--- a/tdecore/DESIGN.tdeconfig
+++ b/tdecore/DESIGN.tdeconfig
@@ -93,7 +93,7 @@ default so that it doesn't change when the default changes?
KDE3.0 Changes
==============
-*) writeEntry now returns void instead of QString.
+*) writeEntry now returns void instead of TQString.
*) deleteEntry functions added
diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk
index c914cc1d2..8ef01e8fe 100644
--- a/tdecore/README.kiosk
+++ b/tdecore/README.kiosk
@@ -647,9 +647,9 @@ TDE Kiosk Application API
Three new methods have been added to TDEApplication:
-- bool authorize(QString action); // Generic actions
-- bool authorizeTDEAction(QString action); // For TDEActions exclusively
-- bool authorizeURLAction(QString, referringURL, destinationURL) // URL Handling
+- bool authorize(TQString action); // Generic actions
+- bool authorizeTDEAction(TQString action); // For TDEActions exclusively
+- bool authorizeURLAction(TQString, referringURL, destinationURL) // URL Handling
Automatic Logout
================
diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp
index 3483039a7..47053223f 100644
--- a/tdecore/kcharsets.cpp
+++ b/tdecore/kcharsets.cpp
@@ -372,13 +372,13 @@ TQChar KCharsets::fromEntity(const TQString &str)
TQChar res = TQChar::null;
int pos = 0;
- if(str[pos] == (QChar)'&') pos++;
+ if(str[pos] == (TQChar)'&') pos++;
// Check for '&#000' or '&#x0000' sequence
- if (str[pos] == (QChar)'#' && str.length()-pos > 1) {
+ if (str[pos] == (TQChar)'#' && str.length()-pos > 1) {
bool ok;
pos++;
- if (str[pos] == (QChar)'x' || str[pos] == (QChar)'X') {
+ if (str[pos] == (TQChar)'x' || str[pos] == (TQChar)'X') {
pos++;
// '&#x0000', hexadeciaml character reference
TQString tmp(str.unicode()+pos, str.length()-pos);
@@ -412,7 +412,7 @@ TQChar KCharsets::fromEntity(const TQString &str, int &len)
{
TQString tmp = str.left(len);
TQChar res = fromEntity(tmp);
- if( res != (QChar)TQChar::null ) return res;
+ if( res != (TQChar)TQChar::null ) return res;
len--;
}
return TQChar::null;
@@ -437,13 +437,13 @@ TQString KCharsets::resolveEntities( const TQString &input )
for ( ; p < end; ++p ) {
const TQChar ch = *p;
- if ( ch == (QChar)'&' ) {
+ if ( ch == (TQChar)'&' ) {
ampersand = p;
scanForSemicolon = true;
continue;
}
- if ( ch != (QChar)';' || scanForSemicolon == false )
+ if ( ch != (TQChar)';' || scanForSemicolon == false )
continue;
assert( ampersand );
diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp
index 78fc06247..d06992390 100644
--- a/tdecore/kdebug.cpp
+++ b/tdecore/kdebug.cpp
@@ -343,7 +343,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char
// Since we are in tdecore here, we cannot use KMsgBox and use
// TQMessageBox instead
if ( !kDebug_data->aAreaName.isEmpty() )
- aCaption += TQString("(%1)").arg( QString(kDebug_data->aAreaName) );
+ aCaption += TQString("(%1)").arg( TQString(kDebug_data->aAreaName) );
TQMessageBox::warning( 0L, aCaption, data, i18n("&OK") );
break;
}
@@ -432,7 +432,7 @@ kdbgstream& kdbgstream::operator<< (TQChar ch)
output += "\\x" + TQString::number( ch.unicode(), 16 ).rightJustify(2, '0');
else {
output += ch;
- if (ch == QChar('\n')) flush();
+ if (ch == TQChar('\n')) flush();
}
return *this;
}
@@ -471,7 +471,7 @@ kdbgstream& kdbgstream::operator<< (const TQWidget* widget)
return *this;
}
output += string;
- if (output.at(output.length() -1 ) == QChar('\n'))
+ if (output.at(output.length() -1 ) == TQChar('\n'))
{
flush();
}
@@ -822,7 +822,7 @@ TQString kdBacktrace(int levels)
if (levels) {
for (int i = 0; i < levels; ++i) {
- rv += QString().sprintf("#%-2d ", i);
+ rv += TQString().sprintf("#%-2d ", i);
rv += formatBacktrace(trace[i]);
rv += '\n';
}
diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h
index 51d751201..e733d8b45 100644
--- a/tdecore/kextsock.h
+++ b/tdecore/kextsock.h
@@ -40,10 +40,10 @@ class KAddressInfo; /* our abstraction of it */
class TQSocketNotifier;
/*
- * This is extending QIODevice's error codes
+ * This is extending TQIODevice's error codes
*
* According to tqiodevice.h, the last error is IO_UnspecifiedError
- * These errors will never occur in functions declared in QIODevice
+ * These errors will never occur in functions declared in TQIODevice
* (except open, but you shouldn't call open)
*/
#define IO_ListenError (IO_UnspecifiedError+1)
@@ -88,7 +88,7 @@ class KExtendedSocketPrivate;
* @author Thiago Macieira <thiago.macieira@kdemail.net>
* @short an extended socket
*/
-class TDECORE_EXPORT KExtendedSocket: public TDEBufferedIO // public TQObject, public QIODevice
+class TDECORE_EXPORT KExtendedSocket: public TDEBufferedIO // public TQObject, public TQIODevice
{
TQ_OBJECT
diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h
index 98a38e645..a11568bd0 100644
--- a/tdecore/kglobalaccel.h
+++ b/tdecore/kglobalaccel.h
@@ -49,8 +49,8 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject
/**
* Creates a new TDEGlobalAccel object with the given pParent and
* psName.
- * @param pParent the parent of the QObject
- * @param psName the name of the QObject
+ * @param pParent the parent of the TQObject
+ * @param psName the name of the TQObject
*/
TDEGlobalAccel( TQObject* pParent, const char* psName = 0 );
virtual ~TDEGlobalAccel();
diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp
index f5b38b75a..c48b1e794 100644
--- a/tdecore/kiconeffect.cpp
+++ b/tdecore/kiconeffect.cpp
@@ -462,7 +462,7 @@ void TDEIconEffect::semiTransparent(TQImage &img)
else
for (y=0; y<height; y++)
{
- QRgb *line = (QRgb *) img.scanLine(y);
+ TQRgb *line = (TQRgb *) img.scanLine(y);
for (x=(y%2); x<width; x+=2)
line[x] &= 0x00ffffff;
}
@@ -530,8 +530,8 @@ void TDEIconEffect::semiTransparent(TQPixmap &pix)
for (int y=0; y<img.height(); y++)
{
- QRgb *line = (QRgb *) img.scanLine(y);
- QRgb pattern = (y % 2) ? 0x55555555 : 0xaaaaaaaa;
+ TQRgb *line = (TQRgb *) img.scanLine(y);
+ TQRgb pattern = (y % 2) ? 0x55555555 : 0xaaaaaaaa;
for (int x=0; x<(img.width()+31)/32; x++)
line[x] &= pattern;
}
@@ -557,11 +557,11 @@ TQImage TDEIconEffect::doublePixels(TQImage src) const
int x, y;
if (src.depth() == 32)
{
- QRgb *l1, *l2;
+ TQRgb *l1, *l2;
for (y=0; y<h; y++)
{
- l1 = (QRgb *) src.scanLine(y);
- l2 = (QRgb *) dst.scanLine(y*2);
+ l1 = (TQRgb *) src.scanLine(y);
+ l2 = (TQRgb *) dst.scanLine(y*2);
for (x=0; x<w; x++)
{
l2[x*2] = l2[x*2+1] = l1[x];
@@ -669,14 +669,14 @@ void TDEIconEffect::overlay(TQImage &src, TQImage &overlay)
if (src.depth() == 32)
{
- QRgb *oline, *sline;
+ TQRgb *oline, *sline;
int r1, g1, b1, a1;
int r2, g2, b2, a2;
for (i=0; i<src.height(); i++)
{
- oline = (QRgb *) overlay.scanLine(i);
- sline = (QRgb *) src.scanLine(i);
+ oline = (TQRgb *) overlay.scanLine(i);
+ sline = (TQRgb *) src.scanLine(i);
for (j=0; j<src.width(); j++)
{
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index 8665b9ce2..f687fab9c 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -812,7 +812,7 @@ TQPixmap TDEIconLoader::loadIcon(const TQString& _name, TDEIcon::Group group, in
*img = img->convertDepth(32);
for (int y = 0; y < img->height(); y++)
{
- QRgb *line = reinterpret_cast<QRgb *>(img->scanLine(y));
+ TQRgb *line = reinterpret_cast<TQRgb *>(img->scanLine(y));
for (int x = 0; x < img->width(); x++)
line[x] = (line[x] & 0x00ffffff) | (TQMIN(0x80, tqAlpha(line[x])) << 24);
}
@@ -851,8 +851,8 @@ TQPixmap TDEIconLoader::loadIcon(const TQString& _name, TDEIcon::Group group, in
line < favIcon.height();
++line )
{
- QRgb* fpos = reinterpret_cast< QRgb* >( favIcon.scanLine( line ));
- QRgb* ipos = reinterpret_cast< QRgb* >( img->scanLine( line + y )) + x;
+ TQRgb* fpos = reinterpret_cast< TQRgb* >( favIcon.scanLine( line ));
+ TQRgb* ipos = reinterpret_cast< TQRgb* >( img->scanLine( line + y )) + x;
for( int i = 0;
i < favIcon.width();
++i, ++fpos, ++ipos )
diff --git a/tdecore/kidna.cpp b/tdecore/kidna.cpp
index ca41fecdf..23d0554d1 100644
--- a/tdecore/kidna.cpp
+++ b/tdecore/kidna.cpp
@@ -41,7 +41,7 @@ TQCString KIDNA::toAsciiCString(const TQString &idna)
TQString KIDNA::toAscii(const TQString &idna)
{
- if (idna.length() && (idna[0] == (QChar)'.'))
+ if (idna.length() && (idna[0] == (TQChar)'.'))
{
TQString host = TQString::fromLatin1(toAsciiCString(idna.mid(1)));
if (host.isEmpty())
@@ -54,7 +54,7 @@ TQString KIDNA::toAscii(const TQString &idna)
TQString KIDNA::toUnicode(const TQString &idna)
{
#ifndef Q_WS_WIN //TODO kresolver not ported
- if (idna.length() && (idna[0] == (QChar)'.'))
+ if (idna.length() && (idna[0] == (TQChar)'.'))
return idna[0] + KResolver::domainToUnicode(idna.mid(1));
return KResolver::domainToUnicode(idna);
#else
diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h
index f23b8cccd..82b268c16 100644
--- a/tdecore/klibloader.h
+++ b/tdecore/klibloader.h
@@ -322,7 +322,7 @@ private:
* The KLibFactory is used to create the components, the library has to offer.
* The factory of KSpread for example will create instances of KSpreadDoc,
* while the Konqueror factory will create KonqView widgets.
- * All objects created by the factory must be derived from TQObject, since QObject
+ * All objects created by the factory must be derived from TQObject, since TQObject
* offers type safe casting.
*
* KLibFactory is an abstract class. Reimplement the
diff --git a/tdecore/kmacroexpander.cpp b/tdecore/kmacroexpander.cpp
index 9cfddcc63..a2ece0a40 100644
--- a/tdecore/kmacroexpander.cpp
+++ b/tdecore/kmacroexpander.cpp
@@ -55,7 +55,7 @@ void KMacroExpanderBase::expandMacros( TQString &str )
TQString rsts;
for (pos = 0; pos < str.length(); ) {
- if (ec != (QChar)0) {
+ if (ec != (TQChar)0) {
if (str.unicode()[pos] != ec)
goto nohit;
if (!(len = expandEscapedMacro( str, pos, rst )))
@@ -110,7 +110,7 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
while (pos < str.length()) {
TQChar cc( str.unicode()[pos] );
- if (ec != (QChar)0) {
+ if (ec != (TQChar)0) {
if (cc != ec)
goto nohit;
if (!(len = expandEscapedMacro( str, pos, rst )))
@@ -160,20 +160,20 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
continue;
nohit:
if (state.current == singlequote) {
- if (cc == (QChar)'\'')
+ if (cc == (TQChar)'\'')
state = sstack.pop();
- } else if (cc == (QChar)'\\') {
+ } else if (cc == (TQChar)'\\') {
// always swallow the char -> prevent anomalies due to expansion
pos += 2;
continue;
} else if (state.current == dollarquote) {
- if (cc == (QChar)'\'')
+ if (cc == (TQChar)'\'')
state = sstack.pop();
- } else if (cc == (QChar)'$') {
+ } else if (cc == (TQChar)'$') {
cc = str[++pos];
- if (cc == (QChar)'(') {
+ if (cc == (TQChar)'(') {
sstack.push( state );
- if (str[pos + 1] == (QChar)'(') {
+ if (str[pos + 1] == (TQChar)'(') {
Save sav = { str, pos + 2 };
ostack.push( sav );
state.current = math;
@@ -183,21 +183,21 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
state.current = paren;
state.dquote = false;
}
- } else if (cc == (QChar)'{') {
+ } else if (cc == (TQChar)'{') {
sstack.push( state );
state.current = subst;
} else if (!state.dquote) {
- if (cc == (QChar)'\'') {
+ if (cc == (TQChar)'\'') {
sstack.push( state );
state.current = dollarquote;
- } else if (cc == (QChar)'"') {
+ } else if (cc == (TQChar)'"') {
sstack.push( state );
state.current = doublequote;
state.dquote = true;
}
}
// always swallow the char -> prevent anomalies due to expansion
- } else if (cc == (QChar)'`') {
+ } else if (cc == (TQChar)'`') {
str.replace( pos, 1, "$( " ); // add space -> avoid creating $((
pos2 = pos += 3;
for (;;) {
@@ -206,12 +206,12 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
return false;
}
cc = str.unicode()[pos2];
- if (cc == (QChar)'`')
+ if (cc == (TQChar)'`')
break;
- if (cc == (QChar)'\\') {
+ if (cc == (TQChar)'\\') {
cc = str[++pos2];
- if (cc == (QChar)'$' || cc == (QChar)'`' || cc == (QChar)'\\' ||
- (cc == (QChar)'"' && state.dquote))
+ if (cc == (TQChar)'$' || cc == (TQChar)'`' || cc == (TQChar)'\\' ||
+ (cc == (TQChar)'"' && state.dquote))
{
str.remove( pos2 - 1, 1 );
continue;
@@ -225,25 +225,25 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
state.dquote = false;
continue;
} else if (state.current == doublequote) {
- if (cc == (QChar)'"')
+ if (cc == (TQChar)'"')
state = sstack.pop();
- } else if (cc == (QChar)'\'') {
+ } else if (cc == (TQChar)'\'') {
if (!state.dquote) {
sstack.push( state );
state.current = singlequote;
}
- } else if (cc == (QChar)'"') {
+ } else if (cc == (TQChar)'"') {
if (!state.dquote) {
sstack.push( state );
state.current = doublequote;
state.dquote = true;
}
} else if (state.current == subst) {
- if (cc == (QChar)'}')
+ if (cc == (TQChar)'}')
state = sstack.pop();
- } else if (cc == (QChar)')') {
+ } else if (cc == (TQChar)')') {
if (state.current == math) {
- if (str[pos + 1] == (QChar)')') {
+ if (str[pos + 1] == (TQChar)')') {
state = sstack.pop();
pos += 2;
} else {
@@ -261,15 +261,15 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
state = sstack.pop();
else
break;
- } else if (cc == (QChar)'}') {
+ } else if (cc == (TQChar)'}') {
if (state.current == KMacroExpander::group)
state = sstack.pop();
else
break;
- } else if (cc == (QChar)'(') {
+ } else if (cc == (TQChar)'(') {
sstack.push( state );
state.current = paren;
- } else if (cc == (QChar)'{') {
+ } else if (cc == (TQChar)'{') {
sstack.push( state );
state.current = KMacroExpander::group;
}
@@ -407,9 +407,9 @@ KMacroMapExpander<TQString,VT>::expandEscapedMacro( const TQString &str, uint po
return 2;
}
uint sl, rsl, rpos;
- if (str[pos + 1] == (QChar)'{') {
+ if (str[pos + 1] == (TQChar)'{') {
rpos = pos + 2;
- for (sl = 0; str[rpos + sl] != (QChar)'}'; sl++)
+ for (sl = 0; str[rpos + sl] != (TQChar)'}'; sl++)
if (rpos + sl >= str.length())
return 0;
rsl = sl + 3;
@@ -473,9 +473,9 @@ KWordMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL
return 2;
}
uint sl, rsl, rpos;
- if (str[pos + 1] == (QChar)'{') {
+ if (str[pos + 1] == (TQChar)'{') {
rpos = pos + 2;
- for (sl = 0; str[rpos + sl] != (QChar)'}'; sl++)
+ for (sl = 0; str[rpos + sl] != (TQChar)'}'; sl++)
if (rpos + sl >= str.length())
return 0;
rsl = sl + 3;
@@ -494,7 +494,7 @@ KWordMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL
////////////
template<class KT,class VT>
-inline QString
+inline TQString
TexpandMacros( const TQString &ostr, const TQMap<KT,VT> &map, TQChar c )
{
TQString str( ostr );
@@ -504,7 +504,7 @@ TexpandMacros( const TQString &ostr, const TQMap<KT,VT> &map, TQChar c )
}
template<class KT,class VT>
-inline QString
+inline TQString
TexpandMacrosShellQuote( const TQString &ostr, const TQMap<KT,VT> &map, TQChar c )
{
TQString str( ostr );
diff --git a/tdecore/kmanagerselection.cpp b/tdecore/kmanagerselection.cpp
index 2e019f73e..0655a4d7e 100644
--- a/tdecore/kmanagerselection.cpp
+++ b/tdecore/kmanagerselection.cpp
@@ -52,7 +52,7 @@ DEALINGS IN THE SOFTWARE.
#include <X11/Xatom.h>
class TDESelectionOwnerPrivate
- : public QWidget
+ : public TQWidget
{
public:
TDESelectionOwnerPrivate( TDESelectionOwner* owner );
@@ -367,7 +367,7 @@ Atom TDESelectionOwner::xa_timestamp = None;
class TDESelectionWatcherPrivate
- : public QWidget
+ : public TQWidget
{
public:
TDESelectionWatcherPrivate( TDESelectionWatcher* watcher );
diff --git a/tdecore/krfcdate.cpp b/tdecore/krfcdate.cpp
index d9a374d0c..327736b40 100644
--- a/tdecore/krfcdate.cpp
+++ b/tdecore/krfcdate.cpp
@@ -394,7 +394,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ )
mday = l[2].toUInt();
// Z suffix means UTC.
- if ((QChar)'Z' == timeString.at(timeString.length() - 1)) {
+ if ((TQChar)'Z' == timeString.at(timeString.length() - 1)) {
timeString.remove(timeString.length() - 1, 1);
}
diff --git a/tdecore/ksavefile.cpp b/tdecore/ksavefile.cpp
index 4ad96c0f2..d9b8867af 100644
--- a/tdecore/ksavefile.cpp
+++ b/tdecore/ksavefile.cpp
@@ -171,7 +171,7 @@ bool KSaveFile::backupFile( const TQString& qFilename, const TQString& backupDir
else
nameOnly = cFilename.mid(slash + 1);
cBackup = TQFile::encodeName(backupDir);
- if ( backupDir[backupDir.length()-1] != (QChar)'/' )
+ if ( backupDir[backupDir.length()-1] != (TQChar)'/' )
cBackup += '/';
cBackup += nameOnly;
}
diff --git a/tdecore/kshell.cpp b/tdecore/kshell.cpp
index 7e4eda947..155ecdb1c 100644
--- a/tdecore/kshell.cpp
+++ b/tdecore/kshell.cpp
@@ -75,17 +75,17 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
c = args.unicode()[pos++];
} while (c.isSpace());
TQString cret;
- if ((flags & TildeExpand) && c == (QChar)'~') {
+ if ((flags & TildeExpand) && c == (TQChar)'~') {
uint opos = pos;
for (; ; pos++) {
if (pos >= args.length())
break;
c = args.unicode()[pos];
- if (c == (QChar)'/' || c.isSpace())
+ if (c == (TQChar)'/' || c.isSpace())
break;
if (isQuoteMeta( c )) {
pos = opos;
- c = (QChar)'~';
+ c = (TQChar)'~';
goto notilde;
}
if ((flags & AbortOnMeta) && isMeta( c ))
@@ -94,7 +94,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
TQString ccret = homeDir( TQConstString( args.unicode() + opos, pos - opos ).string() );
if (ccret.isEmpty()) {
pos = opos;
- c = (QChar)'~';
+ c = (TQChar)'~';
goto notilde;
}
if (pos >= args.length()) {
@@ -111,67 +111,67 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
}
// before the notilde label, as a tilde does not match anyway
if (firstword) {
- if (c == (QChar)'_' || (c >= (QChar)'A' && c <= (QChar)'Z') || (c >= (QChar)'a' && c <= (QChar)'z')) {
+ if (c == (TQChar)'_' || (c >= (TQChar)'A' && c <= (TQChar)'Z') || (c >= (TQChar)'a' && c <= (TQChar)'z')) {
uint pos2 = pos;
TQChar cc;
do
cc = args[pos2++];
- while (cc == (QChar)'_' || (cc >= (QChar)'A' && cc <= (QChar)'Z') ||
- (cc >= (QChar)'a' && cc <= (QChar)'z') || (cc >= (QChar)'0' && cc <= (QChar)'9'));
- if (cc == (QChar)'=')
+ while (cc == (TQChar)'_' || (cc >= (TQChar)'A' && cc <= (TQChar)'Z') ||
+ (cc >= (TQChar)'a' && cc <= (TQChar)'z') || (cc >= (TQChar)'0' && cc <= (TQChar)'9'));
+ if (cc == (TQChar)'=')
goto metaerr;
}
}
notilde:
do {
- if (c == (QChar)'\'') {
+ if (c == (TQChar)'\'') {
uint spos = pos;
do {
if (pos >= args.length())
goto quoteerr;
c = args.unicode()[pos++];
- } while (c != (QChar)'\'');
+ } while (c != (TQChar)'\'');
cret += TQConstString( args.unicode() + spos, pos - spos - 1 ).string();
- } else if (c == (QChar)'"') {
+ } else if (c == (TQChar)'"') {
for (;;) {
if (pos >= args.length())
goto quoteerr;
c = args.unicode()[pos++];
- if (c == (QChar)'"')
+ if (c == (TQChar)'"')
break;
- if (c == (QChar)'\\') {
+ if (c == (TQChar)'\\') {
if (pos >= args.length())
goto quoteerr;
c = args.unicode()[pos++];
- if (c != (QChar)'"' && c != (QChar)'\\' &&
- !((flags & AbortOnMeta) && (c == (QChar)'$' || c == (QChar)'`')))
- cret += (QChar)'\\';
- } else if ((flags & AbortOnMeta) && (c == (QChar)'$' || c == (QChar)'`'))
+ if (c != (TQChar)'"' && c != (TQChar)'\\' &&
+ !((flags & AbortOnMeta) && (c == (TQChar)'$' || c == (TQChar)'`')))
+ cret += (TQChar)'\\';
+ } else if ((flags & AbortOnMeta) && (c == (TQChar)'$' || c == (TQChar)'`'))
goto metaerr;
cret += c;
}
- } else if (c == (QChar)'$' && args[pos] == (QChar)'\'') {
+ } else if (c == (TQChar)'$' && args[pos] == (TQChar)'\'') {
pos++;
for (;;) {
if (pos >= args.length())
goto quoteerr;
c = args.unicode()[pos++];
- if (c == (QChar)'\'')
+ if (c == (TQChar)'\'')
break;
- if (c == (QChar)'\\') {
+ if (c == (TQChar)'\\') {
if (pos >= args.length())
goto quoteerr;
c = args.unicode()[pos++];
switch (c) {
- case 'a': cret += (QChar)'\a'; break;
- case 'b': cret += (QChar)'\b'; break;
- case 'e': cret += (QChar)'\033'; break;
- case 'f': cret += (QChar)'\f'; break;
- case 'n': cret += (QChar)'\n'; break;
- case 'r': cret += (QChar)'\r'; break;
- case 't': cret += (QChar)'\t'; break;
- case '\\': cret += (QChar)'\\'; break;
- case '\'': cret += (QChar)'\''; break;
+ case 'a': cret += (TQChar)'\a'; break;
+ case 'b': cret += (TQChar)'\b'; break;
+ case 'e': cret += (TQChar)'\033'; break;
+ case 'f': cret += (TQChar)'\f'; break;
+ case 'n': cret += (TQChar)'\n'; break;
+ case 'r': cret += (TQChar)'\r'; break;
+ case 't': cret += (TQChar)'\t'; break;
+ case '\\': cret += (TQChar)'\\'; break;
+ case '\'': cret += (TQChar)'\''; break;
case 'c': cret += args[pos++] & 31; break;
case 'x':
{
@@ -189,11 +189,11 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
break;
}
default:
- if (c >= (QChar)'0' && c <= (QChar)'7') {
+ if (c >= (TQChar)'0' && c <= (TQChar)'7') {
int hv = c - '0';
for (int i = 0; i < 2; i++) {
c = args[pos];
- if (c < (QChar)'0' || c > (QChar)'7')
+ if (c < (TQChar)'0' || c > (TQChar)'7')
break;
hv = hv * 8 + (c - '0');
pos++;
@@ -209,7 +209,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
cret += c;
}
} else {
- if (c == (QChar)'\\') {
+ if (c == (TQChar)'\\') {
if (pos >= args.length())
goto quoteerr;
c = args.unicode()[pos++];
@@ -354,7 +354,7 @@ TQString KShell::joinArgsDQ( const TQStringList &args )
TQString KShell::tildeExpand( const TQString &fname )
{
- if (fname[0] == (QChar)'~') {
+ if (fname[0] == (TQChar)'~') {
int pos = fname.find( '/' );
if (pos < 0)
return homeDir( TQConstString( fname.unicode() + 1, fname.length() - 1 ).string() );
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp
index 888ca5bc2..8f189e6d1 100644
--- a/tdecore/kstandarddirs.cpp
+++ b/tdecore/kstandarddirs.cpp
@@ -143,7 +143,7 @@ bool TDEStandardDirs::isRestrictedResource(const char *type, const TQString& rel
void TDEStandardDirs::applyDataRestrictions(const TQString &relPath) const
{
TQString key;
- int i = relPath.find(QChar('/'));
+ int i = relPath.find(TQChar('/'));
if (i != -1)
key = "data_"+relPath.left(i);
else
@@ -188,8 +188,8 @@ void TDEStandardDirs::addPrefix( const TQString& _dir, bool priority )
return;
TQString dir = _dir;
- if (dir.at(dir.length() - 1) != QChar('/'))
- dir += QChar('/');
+ if (dir.at(dir.length() - 1) != TQChar('/'))
+ dir += TQChar('/');
if (!prefixes.contains(dir)) {
priorityAdd(prefixes, dir, priority);
@@ -208,8 +208,8 @@ void TDEStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority )
return;
TQString dir = _dir;
- if (dir.at(dir.length() - 1) != QChar('/'))
- dir += QChar('/');
+ if (dir.at(dir.length() - 1) != TQChar('/'))
+ dir += TQChar('/');
if (!d->xdgconf_prefixes.contains(dir)) {
priorityAdd(d->xdgconf_prefixes, dir, priority);
@@ -228,8 +228,8 @@ void TDEStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority )
return;
TQString dir = _dir;
- if (dir.at(dir.length() - 1) != QChar('/'))
- dir += QChar('/');
+ if (dir.at(dir.length() - 1) != TQChar('/'))
+ dir += TQChar('/');
if (!d->xdgdata_prefixes.contains(dir)) {
priorityAdd(d->xdgdata_prefixes, dir, priority);
@@ -270,8 +270,8 @@ bool TDEStandardDirs::addResourceType( const char *type,
relatives.insert(type, rels);
}
TQString copy = relativename;
- if (copy.at(copy.length() - 1) != QChar('/'))
- copy += QChar('/');
+ if (copy.at(copy.length() - 1) != TQChar('/'))
+ copy += TQChar('/');
if (!rels->contains(copy)) {
if (priority)
rels->prepend(copy);
@@ -300,8 +300,8 @@ bool TDEStandardDirs::addResourceDir( const char *type,
absolutes.insert(type, paths);
}
TQString copy = absdir;
- if (copy.at(copy.length() - 1) != QChar('/'))
- copy += QChar('/');
+ if (copy.at(copy.length() - 1) != TQChar('/'))
+ copy += TQChar('/');
if (!paths->contains(copy)) {
if (priority)
@@ -388,7 +388,7 @@ TQStringList TDEStandardDirs::findDirs( const char *type,
if (reldir.endsWith("/"))
list.append(reldir);
else
- list.append(reldir+QChar('/'));
+ list.append(reldir+TQChar('/'));
}
return list;
}
@@ -403,7 +403,7 @@ TQStringList TDEStandardDirs::findDirs( const char *type,
it != candidates.end(); ++it) {
testdir.setPath(*it + reldir);
if (testdir.exists())
- list.append(testdir.absPath() + QChar('/'));
+ list.append(testdir.absPath() + TQChar('/'));
}
return list;
@@ -451,7 +451,7 @@ bool TDEStandardDirs::exists(const TQString &fullPath)
{
KDE_struct_stat buff;
if ((access(TQFile::encodeName(fullPath), R_OK) == 0) && (KDE_stat( TQFile::encodeName(fullPath), &buff ) == 0)) {
- if (fullPath.at(fullPath.length() - 1) != QChar('/')) {
+ if (fullPath.at(fullPath.length() - 1) != TQChar('/')) {
if (S_ISREG( buff.st_mode ))
return true;
}
@@ -481,9 +481,9 @@ static void lookupDirectory(const TQString& path, const TQString &relPart,
return;
#ifdef Q_WS_WIN
- assert(path.at(path.length() - 1) == QChar('/') || path.at(path.length() - 1) == QChar('\\'));
+ assert(path.at(path.length() - 1) == TQChar('/') || path.at(path.length() - 1) == TQChar('\\'));
#else
- assert(path.at(path.length() - 1) == QChar('/'));
+ assert(path.at(path.length() - 1) == TQChar('/'));
#endif
struct dirent *ep;
@@ -508,7 +508,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart,
}
if ( recursive ) {
if ( S_ISDIR( buff.st_mode )) {
- lookupDirectory(pathfn + QChar('/'), relPart + fn + QChar('/'), regexp, list, relList, recursive, unique);
+ lookupDirectory(pathfn + TQChar('/'), relPart + fn + TQChar('/'), regexp, list, relList, recursive, unique);
}
if (!regexp.exactMatch(fn))
continue; // No match
@@ -560,7 +560,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
if (relpath.length())
{
- int slash = relpath.find(QChar('/'));
+ int slash = relpath.find(TQChar('/'));
if (slash < 0)
rest = relpath.left(relpath.length() - 1);
else {
@@ -572,9 +572,9 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
if (prefix.isEmpty()) //for sanity
return;
#ifdef Q_WS_WIN
- assert(prefix.at(prefix.length() - 1) == QChar('/') || prefix.at(prefix.length() - 1) == QChar('\\'));
+ assert(prefix.at(prefix.length() - 1) == TQChar('/') || prefix.at(prefix.length() - 1) == TQChar('\\'));
#else
- assert(prefix.at(prefix.length() - 1) == QChar('/'));
+ assert(prefix.at(prefix.length() - 1) == TQChar('/'));
#endif
KDE_struct_stat buff;
@@ -594,7 +594,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
while( ( ep = readdir( dp ) ) != 0L )
{
TQString fn( TQFile::decodeName(ep->d_name));
- if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1) == QChar('~'))
+ if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1) == TQChar('~'))
continue;
if ( !pathExp.exactMatch(fn) )
@@ -606,15 +606,15 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
continue; // Couldn't stat (e.g. no permissions)
}
if ( S_ISDIR( buff.st_mode ))
- lookupPrefix(fn + QChar('/'), rest, rfn + QChar('/'), regexp, list, relList, recursive, unique);
+ lookupPrefix(fn + TQChar('/'), rest, rfn + TQChar('/'), regexp, list, relList, recursive, unique);
}
closedir( dp );
} else {
// Don't stat, if the dir doesn't exist we will find out
// when we try to open it.
- lookupPrefix(prefix + path + QChar('/'), rest,
- relPart + path + QChar('/'), regexp, list,
+ lookupPrefix(prefix + path + TQChar('/'), rest,
+ relPart + path + TQChar('/'), regexp, list,
relList, recursive, unique);
}
}
@@ -789,7 +789,7 @@ void TDEStandardDirs::createSpecialResource(const char *type)
}
}
#endif
- addResourceDir(type, dir+QChar('/'));
+ addResourceDir(type, dir+TQChar('/'));
}
TQStringList TDEStandardDirs::resourceDirs(const char *type) const
@@ -904,9 +904,9 @@ TQStringList TDEStandardDirs::systemPaths( const TQString& pstr )
{
p = tokens[ i ];
- if ( p[ 0 ] == QChar('~') )
+ if ( p[ 0 ] == TQChar('~') )
{
- int len = p.find( QChar('/') );
+ int len = p.find( TQChar('/') );
if ( len == -1 )
len = p.length();
if ( len == 1 )
@@ -1183,8 +1183,8 @@ bool TDEStandardDirs::makeDir(const TQString& dir, int mode)
uint len = target.length();
// append trailing slash if missing
- if (dir.at(len - 1) != QChar('/'))
- target += QChar('/');
+ if (dir.at(len - 1) != TQChar('/'))
+ target += TQChar('/');
TQString base("");
uint i = 1;
@@ -1192,7 +1192,7 @@ bool TDEStandardDirs::makeDir(const TQString& dir, int mode)
while( i < len )
{
KDE_struct_stat st;
- int pos = target.find(QChar('/'), i);
+ int pos = target.find(TQChar('/'), i);
base += target.mid(i - 1, pos - i + 1);
TQCString baseEncoded = TQFile::encodeName(base);
// bail out if we encountered a problem
@@ -1340,15 +1340,15 @@ void TDEStandardDirs::addKDEDefaults()
}
if (!localKdeDir.isEmpty())
{
- if (localKdeDir[localKdeDir.length()-1] != QChar('/'))
- localKdeDir += QChar('/');
+ if (localKdeDir[localKdeDir.length()-1] != TQChar('/'))
+ localKdeDir += TQChar('/');
}
else
{
localKdeDir = TQDir::homeDirPath() + "/.trinity/";
}
- if (localKdeDir != QString("-/"))
+ if (localKdeDir != TQString("-/"))
{
localKdeDir = KShell::tildeExpand(localKdeDir);
addPrefix(localKdeDir);
@@ -1384,8 +1384,8 @@ void TDEStandardDirs::addKDEDefaults()
TQString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
if (!localXdgDir.isEmpty())
{
- if (localXdgDir[localXdgDir.length()-1] != QChar('/'))
- localXdgDir += QChar('/');
+ if (localXdgDir[localXdgDir.length()-1] != TQChar('/'))
+ localXdgDir += TQChar('/');
}
else
{
@@ -1416,8 +1416,8 @@ void TDEStandardDirs::addKDEDefaults()
it != tdedirList.end(); ++it)
{
TQString dir = *it;
- if (dir[dir.length()-1] != QChar('/'))
- dir += QChar('/');
+ if (dir[dir.length()-1] != TQChar('/'))
+ dir += TQChar('/');
xdgdirList.append(dir+"share/");
}
@@ -1428,8 +1428,8 @@ void TDEStandardDirs::addKDEDefaults()
localXdgDir = readEnvPath("XDG_DATA_HOME");
if (!localXdgDir.isEmpty())
{
- if (localXdgDir[localXdgDir.length()-1] != QChar('/'))
- localXdgDir += QChar('/');
+ if (localXdgDir[localXdgDir.length()-1] != TQChar('/'))
+ localXdgDir += TQChar('/');
}
else
{
diff --git a/tdecore/kstringhandler.cpp b/tdecore/kstringhandler.cpp
index 5f73c6f7e..e6fef9350 100644
--- a/tdecore/kstringhandler.cpp
+++ b/tdecore/kstringhandler.cpp
@@ -419,8 +419,8 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa
return false;
// Patterns like "Makefile*"
- if ( pattern[ pattern_len - 1 ] == (QChar)'*' && len + 1 >= pattern_len ) {
- if ( pattern[ 0 ] == (QChar)'*' )
+ if ( pattern[ pattern_len - 1 ] == (TQChar)'*' && len + 1 >= pattern_len ) {
+ if ( pattern[ 0 ] == (TQChar)'*' )
{
return filename.find(pattern.mid(1, pattern_len - 2)) != -1;
}
@@ -434,7 +434,7 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa
}
// Patterns like "*~", "*.extension"
- if ( pattern[ 0 ] == (QChar)'*' && len + 1 >= pattern_len )
+ if ( pattern[ 0 ] == (TQChar)'*' && len + 1 >= pattern_len )
{
const TQChar *c1 = pattern.unicode() + pattern_len - 1;
const TQChar *c2 = filename.unicode() + len - 1;
diff --git a/tdecore/kurl.h b/tdecore/kurl.h
index 740c8a0df..283fc57f5 100644
--- a/tdecore/kurl.h
+++ b/tdecore/kurl.h
@@ -128,7 +128,7 @@ class TDECORE_EXPORT KURL
{
public:
/**
- * Flags to choose how file: URLs are treated when creating their QString
+ * Flags to choose how file: URLs are treated when creating their TQString
* representation with prettyURL(int,AdjustementFlags)
*
* However it is recommended to use pathOrURL() instead of this variant of prettyURL()
diff --git a/tdecore/kurldrag.h b/tdecore/kurldrag.h
index ccaf86e1a..ba2c77e1f 100644
--- a/tdecore/kurldrag.h
+++ b/tdecore/kurldrag.h
@@ -52,7 +52,7 @@ public:
* @param urls the list of URLs
* @param dragSource the parent of the TQObject. Should be set when doing drag-n-drop,
* but should be 0 when copying to the clipboard
- * @param name the name of the QObject
+ * @param name the name of the TQObject
*/
KURLDrag( const KURL::List &urls, TQWidget* dragSource = 0, const char * name = 0 );
/**
@@ -62,7 +62,7 @@ public:
* @param metaData a map containing meta data
* @param dragSource the parent of the TQObject. Should be set when doing drag-n-drop,
* but should be 0 when copying to the clipboard
- * @param name the name of the QObject
+ * @param name the name of the TQObject
* @see metaData()
*/
KURLDrag( const KURL::List &urls, const TQMap<TQString, TQString>& metaData,
diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp
index 953ee7265..4c2f34ff5 100644
--- a/tdecore/network/kresolver.cpp
+++ b/tdecore/network/kresolver.cpp
@@ -550,7 +550,7 @@ void KResolver::emitFinished()
emit finished(d->results);
if (p && d->deleteWhenDone)
- deleteLater(); // in QObject
+ deleteLater(); // in TQObject
}
TQString KResolver::errorString(int errorcode, int syserror)
diff --git a/tdecore/network/kstreamsocket.cpp b/tdecore/network/kstreamsocket.cpp
index c323a212e..6ba8dfe8b 100644
--- a/tdecore/network/kstreamsocket.cpp
+++ b/tdecore/network/kstreamsocket.cpp
@@ -130,7 +130,7 @@ bool KStreamSocket::connect(const TQString& node, const TQString& service)
// connection hasn't started yet
if (!blocking())
{
- QObject::connect(this, TQT_SIGNAL(hostFound()), TQT_SLOT(hostFoundSlot()));
+ TQObject::connect(this, TQT_SIGNAL(hostFound()), TQT_SLOT(hostFoundSlot()));
return lookup();
}
@@ -196,7 +196,7 @@ bool KStreamSocket::connect(const KResolverEntry& entry)
void KStreamSocket::hostFoundSlot()
{
- QObject::disconnect(this, TQT_SLOT(hostFoundSlot()));
+ TQObject::disconnect(this, TQT_SLOT(hostFoundSlot()));
if (timeout() > 0)
d->timer.start(timeout(), true);
TQTimer::singleShot(0, this, TQT_SLOT(connectionEvent()));
diff --git a/tdecore/network/tdesocketbase.h b/tdecore/network/tdesocketbase.h
index e50f899dc..bf02a643e 100644
--- a/tdecore/network/tdesocketbase.h
+++ b/tdecore/network/tdesocketbase.h
@@ -63,10 +63,10 @@
#include <tdelibs_export.h>
/*
- * This is extending QIODevice's error codes
+ * This is extending TQIODevice's error codes
*
* According to tqiodevice.h, the last error is IO_UnspecifiedError
- * These errors will never occur in functions declared in QIODevice
+ * These errors will never occur in functions declared in TQIODevice
* (except open, but you shouldn't call open)
*/
#define IO_ListenError (IO_UnspecifiedError+1)
diff --git a/tdecore/tdeaccel.h b/tdecore/tdeaccel.h
index 86366491f..0eb022912 100644
--- a/tdecore/tdeaccel.h
+++ b/tdecore/tdeaccel.h
@@ -96,10 +96,10 @@ class TDECORE_EXPORT TDEAccel : public TQAccel
public:
/**
* Creates a new TDEAccel that watches @p pParent, which is also
- * the QObject's parent.
+ * the TQObject's parent.
*
* @param pParent the parent and widget to watch for key strokes
- * @param psName the name of the QObject
+ * @param psName the name of the TQObject
*/
TDEAccel( TQWidget* pParent, const char* psName = 0 );
@@ -107,8 +107,8 @@ class TDECORE_EXPORT TDEAccel : public TQAccel
* Creates a new TDEAccel that watches @p watch.
*
* @param watch the widget to watch for key strokes
- * @param parent the parent of the QObject
- * @param psName the name of the QObject
+ * @param parent the parent of the TQObject
+ * @param psName the name of the TQObject
*/
TDEAccel( TQWidget* watch, TQObject* parent, const char* psName = 0 );
virtual ~TDEAccel();
diff --git a/tdecore/tdeaccelprivate.h b/tdecore/tdeaccelprivate.h
index 1d297094d..d8b4b1793 100644
--- a/tdecore/tdeaccelprivate.h
+++ b/tdecore/tdeaccelprivate.h
@@ -47,7 +47,7 @@ class TDECORE_EXPORT TDEAccelPrivate : public TQObject, public TDEAccelBase
void slotShowMenu();
void slotMenuActivated( int iAction );
- bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from QObject
+ bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from TQObject
};
#endif // !__TDEACCELPRIVATE_H
diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h
index 7b0ea8012..d7fa84e92 100644
--- a/tdecore/tdeapplication.h
+++ b/tdecore/tdeapplication.h
@@ -1452,7 +1452,7 @@ signals:
* connect to this to monitor global font changes, especially if you are
* using explicit fonts.
*
- * Note: If you derive from a QWidget-based class, a faster method is to
+ * Note: If you derive from a TQWidget-based class, a faster method is to
* reimplement TQWidget::fontChange(). This is the preferred way
* to get informed about font updates.
*/
diff --git a/tdecore/tdecmdlineargs.cpp b/tdecore/tdecmdlineargs.cpp
index 0b9e2693f..68d76f7ff 100644
--- a/tdecore/tdecmdlineargs.cpp
+++ b/tdecore/tdecmdlineargs.cpp
@@ -926,7 +926,7 @@ TDECmdLineArgs::usage(const char *id)
name = name.mid(1);
if ((name[0] == '[') && (name[name.length()-1] == ']'))
name = name.mid(1, name.length()-2);
- printQ(optionFormatString.arg(QString(name), -25)
+ printQ(optionFormatString.arg(TQString(name), -25)
.arg(description));
}
else
@@ -950,12 +950,12 @@ TDECmdLineArgs::usage(const char *id)
opt = opt + name;
if (!option->def)
{
- printQ(optionFormatString.arg(QString(opt), -25)
+ printQ(optionFormatString.arg(TQString(opt), -25)
.arg(description));
}
else
{
- printQ(optionFormatStringDef.arg(QString(opt), -25)
+ printQ(optionFormatStringDef.arg(TQString(opt), -25)
.arg(description).arg(option->def));
}
opt = "";
diff --git a/tdecore/tdeconfig_compiler/README.dox b/tdecore/tdeconfig_compiler/README.dox
index 1b4926e96..b79a086cf 100644
--- a/tdecore/tdeconfig_compiler/README.dox
+++ b/tdecore/tdeconfig_compiler/README.dox
@@ -213,8 +213,8 @@ color_3=#ffff00
\endverbatim
The configuration options will be accessible to the application via
-a QColor color(int ColorIndex) and a
-void setColor(int ColorIndex, const QColor &v) function.
+a TQColor color(int ColorIndex) and a
+void setColor(int ColorIndex, const TQColor &v) function.
Example 2:
\verbatim
@@ -239,8 +239,8 @@ sound_Crash=crash.wav
sound_Missile=missile.wav
The configuration options will be accessible to the application via
-a QString sound(int SoundEvent) and a
-void setSound(int SoundEvent, const QString &v) function.
+a TQString sound(int SoundEvent) and a
+void setSound(int SoundEvent, const TQString &v) function.
- Parameterized groups
diff --git a/tdecore/tdeconfig_compiler/example/example.kcfg b/tdecore/tdeconfig_compiler/example/example.kcfg
index 076bfb644..346e652bb 100644
--- a/tdecore/tdeconfig_compiler/example/example.kcfg
+++ b/tdecore/tdeconfig_compiler/example/example.kcfg
@@ -35,7 +35,7 @@
</entry>
<entry name="MyPath" type="Path">
<label>This is a path</label>
- <default code="true">QDir::homeDirPath()+QString::fromLatin1(".hidden_file")</default>
+ <default code="true">QDir::homeDirPath()+TQString::fromLatin1(".hidden_file")</default>
</entry>
<entry name="MyPaths" type="PathList">
<label>This is a list of paths</label>
diff --git a/tdecore/tdeconfig_compiler/example/general_base.ui b/tdecore/tdeconfig_compiler/example/general_base.ui
index 9b41370c7..9f9d8fbb1 100644
--- a/tdecore/tdeconfig_compiler/example/general_base.ui
+++ b/tdecore/tdeconfig_compiler/example/general_base.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>GeneralBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>GeneralBase</cstring>
</property>
diff --git a/tdecore/tdeconfig_compiler/example/myoptions_base.ui b/tdecore/tdeconfig_compiler/example/myoptions_base.ui
index 3c0c2e6cb..62f0356c5 100644
--- a/tdecore/tdeconfig_compiler/example/myoptions_base.ui
+++ b/tdecore/tdeconfig_compiler/example/myoptions_base.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>MyOptionsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>MyOptionsBase</cstring>
</property>
diff --git a/tdecore/tdeconfigbase.cpp b/tdecore/tdeconfigbase.cpp
index 517024d4b..5d4b7450c 100644
--- a/tdecore/tdeconfigbase.cpp
+++ b/tdecore/tdeconfigbase.cpp
@@ -959,7 +959,7 @@ TQColor TDEConfigBase::readColorEntry( const char *pKey,
TQString aValue = readEntry( pKey );
if( !aValue.isEmpty() )
{
- if ( aValue.at(0) == (QChar)'#' )
+ if ( aValue.at(0) == (TQChar)'#' )
{
aRetColor.setNamedColor(aValue);
}
@@ -1401,7 +1401,7 @@ void TDEConfigBase::writeEntry ( const char *pKey, const TQStrList &list,
}
str_list += sep;
}
- if( str_list.at(str_list.length() - 1) == (QChar)sep )
+ if( str_list.at(str_list.length() - 1) == (TQChar)sep )
str_list.truncate( str_list.length() -1 );
writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS );
}
@@ -1445,7 +1445,7 @@ void TDEConfigBase::writeEntry ( const char *pKey, const TQStringList &list,
}
str_list += sep;
}
- if( str_list.at(str_list.length() - 1) == (QChar)sep )
+ if( str_list.at(str_list.length() - 1) == (TQChar)sep )
str_list.truncate( str_list.length() -1 );
writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS, bExpand );
}
diff --git a/tdecore/tdeconfigdialogmanager.cpp b/tdecore/tdeconfigdialogmanager.cpp
index 9646c897e..016009c18 100644
--- a/tdecore/tdeconfigdialogmanager.cpp
+++ b/tdecore/tdeconfigdialogmanager.cpp
@@ -188,7 +188,7 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha
// If the class name of the widget wasn't in the monitored widgets map, then look for
// it again using the super class name. This fixes a problem with using QtRuby/Korundum
// widgets with TDEConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even
- // though it was a 'QWidget'.
+ // though it was a 'TQWidget'.
changedIt = changedMap.find(childWidget->metaObject()->superClassName());
}
diff --git a/tdecore/tdeglobal.cpp b/tdecore/tdeglobal.cpp
index 8ef5f59db..09f496034 100644
--- a/tdecore/tdeglobal.cpp
+++ b/tdecore/tdeglobal.cpp
@@ -139,7 +139,7 @@ void TDEGlobal::setActiveInstance(TDEInstance *i)
}
/**
- * Create a static QString
+ * Create a static TQString
*
* To be used inside functions(!) like:
* static const TQString &myString = TDEGlobal::staticQString("myText");
@@ -157,7 +157,7 @@ public:
};
/**
- * Create a static QString
+ * Create a static TQString
*
* To be used inside functions(!) like:
* static const TQString &myString = TDEGlobal::staticQString(i18n("My Text"));
diff --git a/tdecore/tdeglobalsettings.cpp b/tdecore/tdeglobalsettings.cpp
index 79cd4586a..11f5a0497 100644
--- a/tdecore/tdeglobalsettings.cpp
+++ b/tdecore/tdeglobalsettings.cpp
@@ -33,7 +33,7 @@
#include <windows.h>
#include "qt_windows.h"
#include <win32_utils.h>
-static QRgb qt_colorref2qrgb(COLORREF col)
+static TQRgb qt_colorref2qrgb(COLORREF col)
{
return tqRgb(GetRValue(col),GetGValue(col),GetBValue(col));
}
diff --git a/tdecore/tdelocale.cpp b/tdecore/tdelocale.cpp
index 97a58fe20..4565a2efc 100644
--- a/tdecore/tdelocale.cpp
+++ b/tdecore/tdelocale.cpp
@@ -1218,34 +1218,34 @@ static void _inc_by_one(TQString &str, int position)
switch(last_char)
{
case '0':
- str[i] = (QChar)'1';
+ str[i] = (TQChar)'1';
break;
case '1':
- str[i] = (QChar)'2';
+ str[i] = (TQChar)'2';
break;
case '2':
- str[i] = (QChar)'3';
+ str[i] = (TQChar)'3';
break;
case '3':
- str[i] = (QChar)'4';
+ str[i] = (TQChar)'4';
break;
case '4':
- str[i] = (QChar)'5';
+ str[i] = (TQChar)'5';
break;
case '5':
- str[i] = (QChar)'6';
+ str[i] = (TQChar)'6';
break;
case '6':
- str[i] = (QChar)'7';
+ str[i] = (TQChar)'7';
break;
case '7':
- str[i] = (QChar)'8';
+ str[i] = (TQChar)'8';
break;
case '8':
- str[i] = (QChar)'9';
+ str[i] = (TQChar)'9';
break;
case '9':
- str[i] = (QChar)'0';
+ str[i] = (TQChar)'0';
if (i == 0) str.prepend('1');
continue;
case '.':
@@ -1310,8 +1310,8 @@ TQString TDELocale::formatNumber(const TQString &numStr, bool round,
// Skip the sign (for now)
- bool neg = (tmpString[0] == (QChar)'-');
- if (neg || tmpString[0] == (QChar)'+') tmpString.remove(0, 1);
+ bool neg = (tmpString[0] == (TQChar)'-');
+ if (neg || tmpString[0] == (TQChar)'+') tmpString.remove(0, 1);
// Split off exponential part (including 'e'-symbol)
TQString mantString = tmpString.section('e', 0, 0,
@@ -1472,7 +1472,7 @@ double TDELocale::readNumber(const TQString &_str, bool * ok) const
}
TQString tot;
- if (neg) tot = (QChar)'-';
+ if (neg) tot = (TQChar)'-';
tot += major + '.' + minor + exponentialPart;
@@ -1502,7 +1502,7 @@ double TDELocale::readMoney(const TQString &_str, bool * ok) const
// (with a special case for parenthesis)
if (negativeMonetarySignPosition() == ParensAround)
{
- if (str[0] == (QChar)'(' && str[str.length()-1] == (QChar)')')
+ if (str[0] == (TQChar)'(' && str[str.length()-1] == (TQChar)')')
{
neg = true;
str.remove(str.length()-1,1);
@@ -1569,7 +1569,7 @@ double TDELocale::readMoney(const TQString &_str, bool * ok) const
}
TQString tot;
- if (neg) tot = (QChar)'-';
+ if (neg) tot = (TQChar)'-';
tot += major + '.' + minior;
return tot.toDouble(ok);
}
@@ -1626,7 +1626,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok
TQChar c = fmt.at(fmtpos++);
- if (c != (QChar)'%') {
+ if (c != (TQChar)'%') {
if (c.isSpace() && str.at(strpos).isSpace())
strpos++;
else if (c != str.at(strpos++))
@@ -1648,7 +1648,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok
error = true;
j = 1;
while (error && (j < 8)) {
- TQString s = calendar()->weekDayName(j, c == (QChar)'a').lower();
+ TQString s = calendar()->weekDayName(j, c == (TQChar)'a').lower();
int len = s.length();
if (str.mid(strpos, len) == s)
{
@@ -1665,7 +1665,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok
if (d->nounDeclension && d->dateMonthNamePossessive) {
j = 1;
while (error && (j < 13)) {
- TQString s = calendar()->monthNamePossessive(j, year, c == (QChar)'b').lower();
+ TQString s = calendar()->monthNamePossessive(j, year, c == (TQChar)'b').lower();
int len = s.length();
if (str.mid(strpos, len) == s) {
month = j;
@@ -1677,7 +1677,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok
}
j = 1;
while (error && (j < 13)) {
- TQString s = calendar()->monthName(j, year, c == (QChar)'b').lower();
+ TQString s = calendar()->monthName(j, year, c == (TQChar)'b').lower();
int len = s.length();
if (str.mid(strpos, len) == s) {
month = j;
@@ -1766,7 +1766,7 @@ TQTime TDELocale::readTime(const TQString &intstr, ReadTimeFlags flags, bool *ok
TQChar c = Format.at(Formatpos++);
- if (c != (QChar)'%')
+ if (c != (TQChar)'%')
{
if (c.isSpace())
strpos++;
@@ -1885,7 +1885,7 @@ TQString TDELocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDur
switch ( TQChar(rst.at( format_index )).unicode() )
{
case '%':
- buffer[index++] = (QChar)'%';
+ buffer[index++] = (TQChar)'%';
break;
case 'H':
put_it_in( buffer, index, pTime.hour() );
diff --git a/tdecore/tdestartupinfo.cpp b/tdecore/tdestartupinfo.cpp
index 77b979edb..2744544a3 100644
--- a/tdecore/tdestartupinfo.cpp
+++ b/tdecore/tdestartupinfo.cpp
@@ -1130,9 +1130,9 @@ TQString TDEStartupInfoData::to_text() const
ret += TQString::fromLatin1( " DESKTOP=%1" )
.arg( d->desktop == NET::OnAllDesktops ? NET::OnAllDesktops : d->desktop - 1 ); // spec counts from 0
if( !d->wmclass.isEmpty())
- ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) );
+ ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( TQString(d->wmclass) );
if( !d->hostname.isEmpty())
- ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) );
+ ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( TQString(d->hostname) );
for( TQValueList< pid_t >::ConstIterator it = d->pids.begin();
it != d->pids.end();
++it )
@@ -1456,7 +1456,7 @@ static
TQString get_str( const TQString& item_P )
{
unsigned int pos = item_P.find( '=' );
- if( item_P.length() > pos + 2 && item_P[ pos + 1 ] == (QChar)'\"' )
+ if( item_P.length() > pos + 2 && item_P[ pos + 1 ] == (TQChar)'\"' )
{
int pos2 = item_P.left( pos + 2 ).find( '\"' );
if( pos2 < 0 )
@@ -1512,8 +1512,8 @@ static TQString escape_str( const TQString& str_P )
pos < str_P.length();
++pos )
{
- if( str_P[ pos ] == (QChar)'\\'
- || str_P[ pos ] == (QChar)'"' )
+ if( str_P[ pos ] == (TQChar)'\\'
+ || str_P[ pos ] == (TQChar)'"' )
ret += '\\';
ret += str_P[ pos ];
}
diff --git a/tdecore/tdesycoca.cpp b/tdecore/tdesycoca.cpp
index c109d5ff4..9eca62ed3 100644
--- a/tdecore/tdesycoca.cpp
+++ b/tdecore/tdesycoca.cpp
@@ -228,7 +228,7 @@ KSycoca::~KSycoca()
void KSycoca::closeDatabase()
{
- QIODevice *device = 0;
+ TQIODevice *device = 0;
if (m_str)
device = m_str->device();
#ifdef HAVE_MMAP
diff --git a/tdecore/tests/kdebugtest.cpp b/tdecore/tests/kdebugtest.cpp
index 4052d5dcf..00f43425c 100644
--- a/tdecore/tests/kdebugtest.cpp
+++ b/tdecore/tests/kdebugtest.cpp
@@ -6,7 +6,7 @@
#include <tqpen.h>
#include <tqvariant.h>
-class TestWidget : public QWidget
+class TestWidget : public TQWidget
{
public:
diff --git a/tdecore/twinmodule.h b/tdecore/twinmodule.h
index 4fa9e07e4..356e85958 100644
--- a/tdecore/twinmodule.h
+++ b/tdecore/twinmodule.h
@@ -61,7 +61,7 @@ public:
/**
* Creates a KWinModule object and connects to the window
* manager.
- * @param parent the parent for the QObject
+ * @param parent the parent for the TQObject
* @param what The information you are interested in:
* INFO_DESKTOP: currentDesktop,
* numberOfDesktops,
@@ -89,7 +89,7 @@ public:
/**
* Creates a KWinModule object and connects to the window
* manager.
- * @param parent the parent for the QObject
+ * @param parent the parent for the TQObject
**/
KWinModule( TQObject* parent = 0 );