diff --git a/doc/kate/regular-expressions.docbook b/doc/kate/regular-expressions.docbook
index c15685d75..51a9cf4e6 100644
--- a/doc/kate/regular-expressions.docbook
+++ b/doc/kate/regular-expressions.docbook
@@ -640,8 +640,8 @@ acknowledged if the following part of the searched string does match
its PATTERN.
The expression const \w+\b(?!\s*&)
will match at const char
in the string const
-char* foo
while it can not match const QString
-in const QString& bar
because the
+char* foo while it can not match const TQString
+in const TQString& bar
because the
&
matches the negative lookahead assertion
pattern.
diff --git a/doc/khelpcenter/adminguide/index.docbook b/doc/khelpcenter/adminguide/index.docbook
index 85c82ff95..c5052185a 100644
--- a/doc/khelpcenter/adminguide/index.docbook
+++ b/doc/khelpcenter/adminguide/index.docbook
@@ -2519,11 +2519,11 @@ session-4
QCStringList interfaces()
QCStringList functions()
int sessionCount()
-QString currentSession()
-QString newSession()
-QString newSession(QString type)
-QString sessionId(int position)
-void activateSession(QString sessionId)
+TQString currentSession()
+TQString newSession()
+TQString newSession(TQString type)
+TQString sessionId(int position)
+void activateSession(TQString sessionId)
void nextSession()
void prevSession()
void moveSessionLeft()
@@ -2541,15 +2541,15 @@ QCStringList functions()
bool closeSession()
bool sendSignal(int signal)
void clearHistory()
-void renameSession(QString name)
-QString sessionName()
+void renameSession(TQString name)
+TQString sessionName()
int sessionPID()
-QString schema()
-void setSchema(QString schema)
-QString encoding()
-void setEncoding(QString encoding)
-QString keytab()
-void setKeytab(QString keyboard)
+TQString schema()
+void setSchema(TQString schema)
+TQString encoding()
+void setEncoding(TQString encoding)
+TQString keytab()
+void setKeytab(TQString keyboard)
QSize size()
void setSize(QSize size)
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook
index f8cc11480..377d2925d 100644
--- a/doc/ksplashml/index.docbook
+++ b/doc/ksplashml/index.docbook
@@ -607,7 +607,7 @@ follows:
DCOPClient *c = kapp->dcopClient();
-QString error;
+TQString error;
QCString KSplashName;
int pid = 0;
QStringList args;
@@ -644,10 +644,10 @@ data))
Whenever you want to display a message with or without an icon, use
- arg << QString("iconName") << QString("programName") <<
-QString("Some description");
+ arg << TQString("iconName") << TQString("programName") <<
+TQString("Some description");
if (!(c->send(KSplashName, "KSplashIface",
-"programStarted(QString,QString,QString)", data))
+"programStarted(TQString,TQString,TQString)", data))
{
// Some error processing here.
}
@@ -791,7 +791,7 @@ functions slotSetText,
slotSetPixmap, slotUpdateProgress and
slotUpdateSteps to make it usable.
The constructor should take the form
-ThemeEngine( QWidget *parent, const char *name, const QStringList
+ThemeEngine( TQWidget *parent, const char *name, const QStringList
&args )
so that it can be used with
KGenericFactory.
@@ -832,11 +832,11 @@ class Theme2k: public ThemeEngine
{
TQ_OBJECT
public:
- Theme2k( QWidget *, const char *, const QStringList& );
+ Theme2k( TQWidget *, const char *, const QStringList& );
- inline const QString name()
+ inline const TQString name()
{
- return( QString("KSplash2k") );
+ return( TQString("KSplash2k") );
}
inline const KDialogBase *config( TDEConfig *kc )
{
@@ -853,7 +853,7 @@ public:
};
public slots:
- inline void slotSetText( const QString& s )
+ inline void slotSetText( const TQString& s )
{
if( mText && mText->text() != s ) mText->setText( s );
};
@@ -864,9 +864,9 @@ private:
QLabel *mText;
RotWidget *mRotator;
- QColor mTBgColor, mTFgColor, mRotColor1, mRotColor2, mStatusColor;
+ TQColor mTBgColor, mTFgColor, mRotColor1, mRotColor2, mStatusColor;
int mRotSpeed;
- QString mWndTitle, mLogoFile;
+ TQString mWndTitle, mLogoFile;
};
#endif
@@ -878,7 +878,7 @@ the naming conventions, and is inherited from
ThemeEngine. It provides
a Theme2k::names(), and has a constructor that takes
the required
-parameters: Theme2k( QWidget *, const char *, const QStringList&
+parameters: Theme2k( TQWidget *, const char *, const QStringList&
);
and also provides a simple Theme2k::slotSetText()
method. For the moment,
@@ -913,7 +913,7 @@ straightforward.
Plugin constructor
-Theme2k::Theme2k( QWidget *parent, const char *name, const QStringList &args
+Theme2k::Theme2k( TQWidget *parent, const char *name, const QStringList &args
)
:ThemeEngine( parent, name, args )
{
@@ -938,10 +938,10 @@ void Theme2k::readSettings()
if( !cfg )
return;
- cfg->setGroup( QString("KSplash Theme: %1").arg(mTheme->theme()) );
+ cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) );
- QColor DefaultTBgColor( Qt::darkBlue );
- QColor DefaultTFgColor( Qt::white );
+ TQColor DefaultTBgColor( Qt::darkBlue );
+ TQColor DefaultTFgColor( Qt::white );
mTBgColor = cfg->readColorEntry( "Title Background Color",
&DefaultTBgColor );
@@ -949,14 +949,14 @@ void Theme2k::readSettings()
&DefaultTFgColor );
mStatusColor = cfg->readColorEntry("Status Text Color", &mTBgColor );
- QColor DefaultRot1( Qt::darkBlue );
- QColor DefaultRot2( Qt::cyan );
+ TQColor DefaultRot1( Qt::darkBlue );
+ TQColor DefaultRot2( Qt::cyan );
mRotColor1 = cfg->readColorEntry( "Rotator Color 1", &DefaultRot1 );
mRotColor2 = cfg->readColorEntry( "Rotator Color 2", &DefaultRot2 );
mRotSpeed = cfg->readNumEntry( "Rotator Speed", 30 );
mWndTitle = cfg->readEntry( "Window Title", i18n("Please wait...") );
- mLogoFile = cfg->readEntry( "Logo File", QString::null );
+ mLogoFile = cfg->readEntry( "Logo File", TQString::null );
}
@@ -1112,7 +1112,7 @@ K_EXPORT_COMPONENT_FACTORY( ksplash2k, KGenericFactory<Theme2k> );
Cfg2k::Cfg2k( TDEConfig * )
{}
-Theme2k::Theme2k( QWidget *parent, const char *name, const QStringList &args
+Theme2k::Theme2k( TQWidget *parent, const char *name, const QStringList &args
)
:ThemeEngine( parent, name, args )
{
@@ -1136,8 +1136,8 @@ void Theme2k::initUi()
QLabel *logo = new QLabel( vbox );
logo->setPalette( Qt::white );
- QString px( locate( "appdata", mTheme->themeDir() +
-(mLogoFile.isNull()?QString("/Logo.png"):mLogoFile) ) );
+ TQString px( locate( "appdata", mTheme->themeDir() +
+(mLogoFile.isNull()?TQString("/Logo.png"):mLogoFile) ) );
if (px.isNull())
px = locate("appdata","Themes/Default/splash_top.png");
if( !px.isNull() )
@@ -1178,10 +1178,10 @@ void Theme2k::readSettings()
if( !cfg )
return;
- cfg->setGroup( QString("KSplash Theme: %1").arg(mTheme->theme()) );
+ cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) );
- QColor DefaultTBgColor( Qt::darkBlue );
- QColor DefaultTFgColor( Qt::white );
+ TQColor DefaultTBgColor( Qt::darkBlue );
+ TQColor DefaultTFgColor( Qt::white );
mTBgColor = cfg->readColorEntry( "Title Background Color",
&DefaultTBgColor );
@@ -1189,14 +1189,14 @@ void Theme2k::readSettings()
&DefaultTFgColor );
mStatusColor = cfg->readColorEntry("Status Text Color", &mTBgColor );
- QColor DefaultRot1( Qt::darkBlue );
- QColor DefaultRot2( Qt::cyan );
+ TQColor DefaultRot1( Qt::darkBlue );
+ TQColor DefaultRot2( Qt::cyan );
mRotColor1 = cfg->readColorEntry( "Rotator Color 1", &DefaultRot1 );
mRotColor2 = cfg->readColorEntry( "Rotator Color 2", &DefaultRot2 );
mRotSpeed = cfg->readNumEntry( "Rotator Speed", 30 );
mWndTitle = cfg->readEntry( "Window Title", i18n("Please wait...") );
- mLogoFile = cfg->readEntry( "Logo File", QString::null );
+ mLogoFile = cfg->readEntry( "Logo File", TQString::null );
}
@@ -1216,11 +1216,11 @@ void Theme2k::readSettings()
/**
* @short Display a rotating-gradient widget.
*/
-class RotWidget: public QWidget
+class RotWidget: public TQWidget
{
TQ_OBJECT
public:
- RotWidget( QWidget *, const QColor&, const QColor&, int );
+ RotWidget( TQWidget *, const TQColor&, const TQColor&, int );
~RotWidget();
private slots:
@@ -1231,7 +1231,7 @@ protected:
void paintEvent( QPaintEvent * );
void resizeEvent( QResizeEvent * );
- QColor m_color1, m_color2;
+ TQColor m_color1, m_color2;
int m_step, m_speed;
QTimer *m_stepTimer;
@@ -1255,9 +1255,9 @@ protected:
#include "rotwidget.h"
#include "rotwidget.moc"
-RotWidget::RotWidget( QWidget *parent, const QColor& c1, const QColor&
+RotWidget::RotWidget( TQWidget *parent, const TQColor& c1, const TQColor&
c2, int sp )
- :QWidget(parent), m_color1(c1), m_color2(c2), m_step(0), m_speed(sp)
+ :TQWidget(parent), m_color1(c1), m_color2(c2), m_step(0), m_speed(sp)
{
if( (m_speed <= 0) || (m_speed > 20) )
m_speed = 1;
diff --git a/kate/README b/kate/README
index 67eb04be6..6d0d7d04d 100644
--- a/kate/README
+++ b/kate/README
@@ -19,6 +19,6 @@ Licensing:
The Kate app/utils/interfaces and KWrite app are licensed under the LGPL VERSION 2.
*** Undocumented features in Kate version 2.5.2 ***
-* The KateApplication DCOP interface has a function QString session() that
+* The KateApplication DCOP interface has a function TQString session() that
returns the name of the active session (which might be an empty string).
(but hey, documentation of the DCOP interface is missing completely)
\ No newline at end of file
diff --git a/kate/app/katedocmanager.h b/kate/app/katedocmanager.h
index 37f102a20..81ff7a5c8 100644
--- a/kate/app/katedocmanager.h
+++ b/kate/app/katedocmanager.h
@@ -52,7 +52,7 @@ class KateDocumentInfo
unsigned char modifiedOnDiscReason;
};
-typedef QPair TPair;
+typedef TQPair TPair;
class KateDocManager : public TQObject
{
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 9ce970849..eb459fc1d 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -257,7 +257,7 @@ void ToolView::childEvent ( TQChildEvent *ev )
{
// set the widget to be focus proxy if possible
if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->tqt_cast("TQWidget")) {
- setFocusProxy (::tqqt_cast(TQT_TQOBJECT(ev->child())));
+ setFocusProxy (::tqqt_cast(TQT_TQOBJECT(ev->child())));
}
TQVBox::childEvent (ev);
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 67756d466..aaa6f3260 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -528,7 +528,7 @@ void BGDialog::loadWallpaperFilesList() {
// Wallpapers
// the following TQMap is lower cased names mapped to cased names and URLs
// this way we get case insensitive sorting
- TQMap > papers;
+ TQMap > papers;
//search for .desktop files before searching for images without .desktop files
TQStringList lst = m_pDirs->findAllResources("wallpaper", "*desktop", false, true);
@@ -620,7 +620,7 @@ void BGDialog::loadWallpaperFilesList() {
comboWallpaper->clear();
m_wallpaper.clear();
int i = 0;
- for (TQMap >::Iterator it = papers.begin();
+ for (TQMap >::Iterator it = papers.begin();
it != papers.end();
++it)
{
diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h
index 5b96f31b0..f9042dd56 100644
--- a/kcontrol/background/bgrender.h
+++ b/kcontrol/background/bgrender.h
@@ -120,7 +120,7 @@ private:
* images. Usage is similar to KBackgroundRenderer: connect to the imageDone
* signal.
*/
-class KVirtualBGRenderer : public QObject
+class KVirtualBGRenderer : public TQObject
{
TQ_OBJECT
public:
diff --git a/kcontrol/info/info_solaris.cpp b/kcontrol/info/info_solaris.cpp
index f52927424..f6ab922ea 100644
--- a/kcontrol/info/info_solaris.cpp
+++ b/kcontrol/info/info_solaris.cpp
@@ -486,7 +486,7 @@ TQString propvalue( di_prop_t prop ) {
char *strp;
int *intp;
uchar_t *bytep;
- QString result;
+ TQString result;
/*
* Since a lot of printable strings seem to be tagged as 'byte',
@@ -565,11 +565,11 @@ int dump_node( di_node_t node, void *arg ) {
TQListViewItem *top = (TQListViewItem *) arg,
*parent,
*previous;
- char *path;
- char *drivername;
- char *names;
- QString compatnames;
- int i, n;
+ char *path;
+ char *drivername;
+ char *names;
+ TQString compatnames;
+ int i, n;
di_prop_t prop;
path = di_devfs_path( node );
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index b323b44da..d131aca8c 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -580,7 +580,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
// Calculate the image size
int size = kMax( iconSize, kMax( r.width(), r.height() ) );
- // Create the intermediate QImage
+ // Create the intermediate TQImage
TQImage image( size, size, 32 );
image.setAlphaBuffer( true );
diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp
index 1aa0f58df..1c72b1ccc 100644
--- a/kcontrol/randr/ktimerdialog.cpp
+++ b/kcontrol/randr/ktimerdialog.cpp
@@ -35,9 +35,9 @@
#include "ktimerdialog.h"
#include "ktimerdialog.moc"
-KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent,
+KTimerDialog::KTimerDialog( int msec, TimerStyle style, TQWidget *parent,
const char *name, bool modal,
- const QString &caption,
+ const TQString &caption,
int buttonMask, ButtonCode defaultButton,
bool separator,
const KGuiItem &user1,
@@ -90,7 +90,7 @@ int KTimerDialog::exec()
return KDialogBase::exec();
}
-void KTimerDialog::setMainWidget( QWidget *widget )
+void KTimerDialog::setMainWidget( TQWidget *widget )
{
// yuck, here goes.
QVBox *newWidget = new QVBox( this );
diff --git a/kcontrol/randr/ktimerdialog.h b/kcontrol/randr/ktimerdialog.h
index 759f87cd9..74891d048 100644
--- a/kcontrol/randr/ktimerdialog.h
+++ b/kcontrol/randr/ktimerdialog.h
@@ -67,9 +67,9 @@ class KTimerDialog : public KDialogBase
*
* For the rest of the arguments, See @see KDialogBase .
*/
- KTimerDialog( int msec, TimerStyle style=CountDown, QWidget *parent=0,
+ KTimerDialog( int msec, TimerStyle style=CountDown, TQWidget *parent=0,
const char *name=0, bool modal=true,
- const QString &caption=QString::null,
+ const TQString &caption=TQString::null,
int buttonMask=Ok|Apply|Cancel, ButtonCode defaultButton=Ok,
bool separator=false,
const KGuiItem &user1=KGuiItem(),
@@ -117,7 +117,7 @@ class KTimerDialog : public KDialogBase
* Overridden function which is used to set the main widget of the dialog.
* @see KDialogBase::setMainWidget.
*/
- void setMainWidget( QWidget *widget );
+ void setMainWidget( TQWidget *widget );
signals:
/**
diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui
index 3b32d63b7..d4ad3e1b7 100644
--- a/kcontrol/smartcard/nosmartcardbase.ui
+++ b/kcontrol/smartcard/nosmartcardbase.ui
@@ -1,6 +1,6 @@
NoSmartcardBase
-
+
NoSmartcardBase
diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui
index e7a3344ce..9dee7d69b 100644
--- a/kcontrol/smartcard/smartcardbase.ui
+++ b/kcontrol/smartcard/smartcardbase.ui
@@ -1,6 +1,6 @@
SmartcardBase
-
+
SmartcardBase
@@ -23,7 +23,7 @@
true
-
+
tab
@@ -127,7 +127,7 @@
-
+
tab
diff --git a/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO b/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO
index a592d4b57..b96168964 100644
--- a/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO
+++ b/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO
@@ -29,7 +29,7 @@ NEW PROPERTIES:
===============
X-TDE-UA-TAG
FIELD: REQUIRED
-TYPE: QString
+TYPE: TQString
TRANSLATE: NO
DESCRIPTION:
An abbreviation of the actual browser-brand and is used
@@ -42,7 +42,7 @@ actual user-agent name (X-TDE-UA-NAME).
X-TDE-UA-FULL
FIELD: REQUIRED
-TYPE: QString
+TYPE: TQString
TRANSLATE: NO
DESCRIPTION:
The full user-agent description that will be sent to the remote
@@ -62,21 +62,21 @@ and set its value to 1 (for true).
X-TDE-UA-NAME
FIELD: REQUIRED
-TYPE: QString
+TYPE: TQString
TRANSLATE: YES
DESCRIPTION:
The actual name of the browser or user-agent.
X-TDE-UA-VERSION
FIELD: REQUIRED
-TYPE: QString
+TYPE: TQString
TRANSLATE: YES
DESCRIPTION:
The actual version of the browser or user-agent.
X-TDE-UA-SYSNAME
FIELD: OPTIONAL
-TYPE: QString
+TYPE: TQString
TRANSLATE: YES
DESCRIPTION:
The system name (for example Linux) where the browser
@@ -84,7 +84,7 @@ identification was obtained from.
X-TDE-UA-SYSRELEASE
FIELD: OPTIONAL
-TYPE: QString
+TYPE: TQString
TRANSLATE: YES
DESCRIPTION:
The system version (for example 2.4.1) where the browser
diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp
index 2a5f72895..be0ee58a7 100644
--- a/kcontrol/tdm/main.cpp
+++ b/kcontrol/tdm/main.cpp
@@ -127,13 +127,13 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
TQMap tgmap;
TQMap::Iterator tgmapi;
TQMap::ConstIterator tgmapci;
- TQMap >::Iterator umapi;
+ TQMap >::Iterator umapi;
struct passwd *ps;
for (setpwent(); (ps = getpwent()); ) {
TQString un( TQFile::decodeName( ps->pw_name ) );
if (usermap.find( un ) == usermap.end()) {
- usermap.insert( un, QPair( ps->pw_uid, sl ) );
+ usermap.insert( un, TQPair( ps->pw_uid, sl ) );
if ((tgmapi = tgmap.find( ps->pw_gid )) != tgmap.end())
(*tgmapi).append( un );
else
@@ -298,7 +298,7 @@ void TDModule::propagateUsers()
groupmap.clear();
emit clearUsers();
TQMap lusers;
- TQMapConstIterator > it;
+ TQMapConstIterator > it;
TQStringList::ConstIterator jt;
TQMap::Iterator gmapi;
for (it = usermap.begin(); it != usermap.end(); ++it) {
@@ -321,7 +321,7 @@ void TDModule::slotMinMaxUID(int min, int max)
{
if (updateOK) {
TQMap alusers, dlusers;
- TQMapConstIterator > it;
+ TQMapConstIterator > it;
TQStringList::ConstIterator jt;
TQMap::Iterator gmapi;
for (it = usermap.begin(); it != usermap.end(); ++it) {
diff --git a/kcontrol/tdm/main.h b/kcontrol/tdm/main.h
index c2ee65526..4274e8323 100644
--- a/kcontrol/tdm/main.h
+++ b/kcontrol/tdm/main.h
@@ -71,7 +71,7 @@ private:
TDMUsersWidget *users;
TDMConvenienceWidget *convenience;
- TQMap > usermap;
+ TQMap > usermap;
TQMap groupmap;
int minshowuid, maxshowuid;
bool updateOK;
diff --git a/kdesktop/desktop.cpp b/kdesktop/desktop.cpp
index 9539d8a1e..52e0d0c4a 100644
--- a/kdesktop/desktop.cpp
+++ b/kdesktop/desktop.cpp
@@ -272,7 +272,7 @@ KDesktop::initRoot()
connect( m_pIconView, TQT_SIGNAL( wheelRolled( int ) ),
this, TQT_SLOT( slotSwitchDesktops( int ) ) );
- // All the QScrollView/QWidget-specific stuff should go here, so that we can use
+ // All the QScrollView/TQWidget-specific stuff should go here, so that we can use
// another qscrollview/widget instead of the iconview and use the same code
m_pIconView->setVScrollBarMode( TQScrollView::AlwaysOff );
m_pIconView->setHScrollBarMode( TQScrollView::AlwaysOff );
diff --git a/kdesktop/kwebdesktop/kwebdesktop.h b/kdesktop/kwebdesktop/kwebdesktop.h
index afbd9f0e7..686e40297 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.h
+++ b/kdesktop/kwebdesktop/kwebdesktop.h
@@ -51,7 +51,7 @@ private:
};
-class KWebDesktopRun : public QObject
+class KWebDesktopRun : public TQObject
{
TQ_OBJECT
public:
diff --git a/khelpcenter/DESIGN b/khelpcenter/DESIGN
index 39498732d..f2e11d0cf 100644
--- a/khelpcenter/DESIGN
+++ b/khelpcenter/DESIGN
@@ -384,7 +384,7 @@ protocol == "help") by itself and otherwise use the plain URL.
## mode.
# Hmm yes, that should be possible. Take the toplevel widget, use
-# QObject::children() and iterate over all children, use QToolTip::textFor() to
+# TQObject::children() and iterate over all children, use QToolTip::textFor() to
# check whether the given qwidget has a tooltip and if so, use QToolTip::tip()
# to show the tooltip.
# One could probably add a standard dcop call to TDEMainWindow, like
diff --git a/khelpcenter/htmlsearch.h b/khelpcenter/htmlsearch.h
index 0ece31378..355e8932f 100644
--- a/khelpcenter/htmlsearch.h
+++ b/khelpcenter/htmlsearch.h
@@ -10,7 +10,7 @@ namespace KHC {
class DocEntry;
-class HTMLSearch : public QObject
+class HTMLSearch : public TQObject
{
TQ_OBJECT
public:
diff --git a/khelpcenter/htmlsearch/htmlsearch.h b/khelpcenter/htmlsearch/htmlsearch.h
index 0dafe76e1..e0c533f81 100644
--- a/khelpcenter/htmlsearch/htmlsearch.h
+++ b/khelpcenter/htmlsearch/htmlsearch.h
@@ -16,7 +16,7 @@ class TDEProcess;
class ProgressDialog;
-class HTMLSearch : public QObject
+class HTMLSearch : public TQObject
{
TQ_OBJECT
diff --git a/khelpcenter/khc_indexbuilder.h b/khelpcenter/khc_indexbuilder.h
index b13ea092b..8cbaf6b00 100644
--- a/khelpcenter/khc_indexbuilder.h
+++ b/khelpcenter/khc_indexbuilder.h
@@ -30,7 +30,7 @@ class TDEProcess;
namespace KHC {
-class IndexBuilder : public QObject
+class IndexBuilder : public TQObject
{
TQ_OBJECT
public:
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index f8e4c2b62..4a691240d 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -134,8 +134,8 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
mSearchWidget->readConfig( TDEGlobal::config() );
}
- connect( mTabWidget, TQT_SIGNAL( currentChanged( QWidget * ) ),
- TQT_SLOT( slotTabChanged( QWidget * ) ) );
+ connect( mTabWidget, TQT_SIGNAL( currentChanged( TQWidget * ) ),
+ TQT_SLOT( slotTabChanged( TQWidget * ) ) );
}
Navigator::~Navigator()
diff --git a/khelpcenter/searchhandler.h b/khelpcenter/searchhandler.h
index e5592e022..b580d0ebb 100644
--- a/khelpcenter/searchhandler.h
+++ b/khelpcenter/searchhandler.h
@@ -47,7 +47,7 @@ class SearchJob
TQString mError;
};
-class SearchHandler : public QObject
+class SearchHandler : public TQObject
{
TQ_OBJECT
public:
diff --git a/khelpcenter/toc.h b/khelpcenter/toc.h
index c4d76bb0b..dba0921fc 100644
--- a/khelpcenter/toc.h
+++ b/khelpcenter/toc.h
@@ -30,7 +30,7 @@ class TDEProcess;
namespace KHC {
-class TOC : public QObject
+class TOC : public TQObject
{
TQ_OBJECT
public:
diff --git a/khotkeys/README b/khotkeys/README
index 933ebc210..78d9d1014 100644
--- a/khotkeys/README
+++ b/khotkeys/README
@@ -97,7 +97,7 @@
a .desktop file from the TDE Menu to execute (e.g. 'System/konsole.desktop')
- DCOP call tab settings - enter the application, object, DCOP method and
arguments (e.g. 'kdesktop', 'KBackgroundIface',
- 'setWallpaper(QString,int)' and '"/some/pic.jpg" 1')
+ 'setWallpaper(TQString,int)' and '"/some/pic.jpg" 1')
- Keyboard input tab settings - enter the keyboard input you want to be
simulated ( no, sorry, the 'Edit' button doesn't really work yet ).
The "keypresses" are separated by a colon ( ':' ) and are written
diff --git a/khotkeys/kcontrol/windowselector.h b/khotkeys/kcontrol/windowselector.h
index 96fff4cb7..0abb41811 100644
--- a/khotkeys/kcontrol/windowselector.h
+++ b/khotkeys/kcontrol/windowselector.h
@@ -17,7 +17,7 @@ namespace KHotKeys
{
class WindowSelector
- : public QWidget
+ : public TQWidget
{
TQ_OBJECT
public:
diff --git a/kicker/HACKING b/kicker/HACKING
index d4d7b19f4..12f48652d 100644
--- a/kicker/HACKING
+++ b/kicker/HACKING
@@ -3,10 +3,10 @@ The Short Story
Four space tabs, braces on their own lines, 80 character lines.
Code should look something like this:
-QString ExtensionManager::uniqueId()
+TQString ExtensionManager::uniqueId()
{
- QString idBase = "Extension_%1";
- QString newId;
+ TQString idBase = "Extension_%1";
+ TQString newId;
int i = 0;
bool unique = false;
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index 1ee251b36..82a0a35a8 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -1077,7 +1077,7 @@ void QuickLauncher::updateStickyHighlightLayer()
m_stickyHighlightLayer = TQImage(width(), height(), 32);
m_stickyHighlightLayer.setAlphaBuffer(true);
int pix, tlPix, brPix, w(width()), h(height());
- QRgb transparent(tqRgba(0, 0, 0, 0));
+ TQRgb transparent(tqRgba(0, 0, 0, 0));
for (int y = h-1; y >= 0; --y)
{
for (int x = w-1; x >= 0; --x)
diff --git a/kicker/extensions/kasbar/docs.h b/kicker/extensions/kasbar/docs.h
index 105176d08..8a5ded920 100644
--- a/kicker/extensions/kasbar/docs.h
+++ b/kicker/extensions/kasbar/docs.h
@@ -36,19 +36,19 @@
-class QObject
+class TQObject
{
};
-class TQWidget : public QObject
+class TQWidget : public TQObject
{
};
-class TQDialog : public QWidget
+class TQDialog : public TQWidget
{
};
-class TQFrame : public QWidget
+class TQFrame : public TQWidget
{
};
@@ -64,6 +64,6 @@ class KDialogBase : public QDialog
{
};
-class KPanelExtension : public QWidget
+class KPanelExtension : public TQWidget
{
};
diff --git a/kicker/kicker/core/unhidetrigger.h b/kicker/kicker/core/unhidetrigger.h
index 07683bc0b..472009014 100644
--- a/kicker/kicker/core/unhidetrigger.h
+++ b/kicker/kicker/core/unhidetrigger.h
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include
-class UnhideTrigger : public QObject
+class UnhideTrigger : public TQObject
{
TQ_OBJECT
public:
diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg
index dfdf501e4..9951fe9e1 100644
--- a/kicker/libkicker/kickerSettings.kcfg
+++ b/kicker/libkicker/kickerSettings.kcfg
@@ -316,7 +316,7 @@
- QColor()
+ TQColor()
@@ -325,7 +325,7 @@
- QColor()
+ TQColor()
@@ -334,7 +334,7 @@
- QColor()
+ TQColor()
@@ -343,7 +343,7 @@
- QColor()
+ TQColor()
@@ -352,7 +352,7 @@
- QColor()
+ TQColor()
@@ -416,7 +416,7 @@
- QString("kmenu")
+ TQString("kmenu")
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index d4e04f6b5..af4f0f909 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -1254,7 +1254,7 @@ TQImage* TaskBar::blendGradient(const TQSize& size)
void TaskBar::sortContainersByDesktop(TaskContainer::List& list)
{
- typedef TQValueVector > > SortVector;
+ typedef TQValueVector > > SortVector;
SortVector sorted;
sorted.resize(list.count());
int i = 0;
diff --git a/kicker/taskbar/taskbar.kcfg b/kicker/taskbar/taskbar.kcfg
index 7436f2e8e..86ea32dca 100644
--- a/kicker/taskbar/taskbar.kcfg
+++ b/kicker/taskbar/taskbar.kcfg
@@ -200,17 +200,17 @@
- QColor()
+ TQColor()
This color is used for displaying text on taskbar button for task which is active at the moment.
- QColor()
+ TQColor()
This color is used for displaying text on taskbar button for tasks other than active.
- QColor()
+ TQColor()
This color is used for displaying background of taskbar buttons.
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 9cea8a32e..cf3dbc648 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -1726,7 +1726,7 @@ void TaskContainer::updateFilteredTaskList()
// sort container list by desktop
if (taskBar->sortByDesktop() && m_filteredTasks.count() > 1)
{
- TQValueVector > sorted;
+ TQValueVector > sorted;
sorted.resize(m_filteredTasks.count());
int i = 0;
@@ -1741,7 +1741,7 @@ void TaskContainer::updateFilteredTaskList()
qHeapSort(sorted);
m_filteredTasks.clear();
- for (TQValueVector >::iterator it = sorted.begin();
+ for (TQValueVector >::iterator it = sorted.begin();
it != sorted.end();
++it)
{
diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp
index 7f7e31dce..10e330fde 100644
--- a/kmenuedit/treeview.cpp
+++ b/kmenuedit/treeview.cpp
@@ -378,7 +378,7 @@ TreeItem *TreeView::createTreeItem(TreeItem *parent, TQListViewItem *after, Menu
else
item = new TreeItem(parent, after, entryInfo->menuId(),_init);
- QString name;
+ TQString name;
if (m_detailedMenuEntries && entryInfo->description.length() != 0)
{
@@ -566,7 +566,7 @@ void TreeView::currentChanged(MenuEntryInfo *entryInfo)
if (item == 0) return;
if (entryInfo == 0) return;
- QString name;
+ TQString name;
if (m_detailedMenuEntries && entryInfo->description.length() != 0)
{
diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h
index dd8d54fec..f0713fcde 100644
--- a/konqueror/iconview/konq_iconview.h
+++ b/konqueror/iconview/konq_iconview.h
@@ -275,7 +275,7 @@ private:
bool m_bSaveViewPropertiesLocally;
};
-class SpringLoadingManager : public QObject
+class SpringLoadingManager : public TQObject
{
TQ_OBJECT
private:
diff --git a/konqueror/keditbookmarks/actionsimpl.h b/konqueror/keditbookmarks/actionsimpl.h
index 399477d0c..f0137245b 100644
--- a/konqueror/keditbookmarks/actionsimpl.h
+++ b/konqueror/keditbookmarks/actionsimpl.h
@@ -21,7 +21,7 @@
#include
-class ActionsImpl : public QObject
+class ActionsImpl : public TQObject
{
TQ_OBJECT
diff --git a/konqueror/keditbookmarks/bookmarkiterator.h b/konqueror/keditbookmarks/bookmarkiterator.h
index 1f34b5f99..8f5df481a 100644
--- a/konqueror/keditbookmarks/bookmarkiterator.h
+++ b/konqueror/keditbookmarks/bookmarkiterator.h
@@ -26,7 +26,7 @@
class KEBListViewItem;
class BookmarkIteratorHolder;
-class BookmarkIterator : public QObject
+class BookmarkIterator : public TQObject
{
TQ_OBJECT
diff --git a/konqueror/keditbookmarks/updater.h b/konqueror/keditbookmarks/updater.h
index 6f1afb550..0e0e8b336 100644
--- a/konqueror/keditbookmarks/updater.h
+++ b/konqueror/keditbookmarks/updater.h
@@ -25,7 +25,7 @@
#include
#include
-class FavIconWebGrabber : public QObject
+class FavIconWebGrabber : public TQObject
{
TQ_OBJECT
public:
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 8054f98e9..3d22c4bd2 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -647,7 +647,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
// draw background colors with 75% opacity
if ( draw_translucent_background_colors && argb_visual && tqAlpha(blend_color) < 0xff )
{
- QRgb col = bColor.rgb();
+ TQRgb col = bColor.rgb();
TQ_UINT8 salpha = 192;
TQ_UINT8 dalpha = 255 - salpha;
diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h
index 8ef1ba9ed..047c04b4b 100644
--- a/konsole/konsole/TEWidget.h
+++ b/konsole/konsole/TEWidget.h
@@ -53,7 +53,7 @@ public:
TEWidget(TQWidget *parent=0, const char *name=0);
virtual ~TEWidget();
- void setBlendColor(const QRgb color) { blend_color = color; }
+ void setBlendColor(const TQRgb color) { blend_color = color; }
void setDefaultBackColor(const TQColor& color);
TQColor getDefaultBackColor();
@@ -339,7 +339,7 @@ private:
bool m_isIMEdit;
bool m_isIMSel;
- QRgb blend_color;
+ TQRgb blend_color;
private slots:
void drop_menu_activated(int item);
diff --git a/konsole/konsole/TEmulation.h b/konsole/konsole/TEmulation.h
index 56b099ea6..e6050a9da 100644
--- a/konsole/konsole/TEmulation.h
+++ b/konsole/konsole/TEmulation.h
@@ -31,7 +31,7 @@
enum { NOTIFYNORMAL=0, NOTIFYBELL=1, NOTIFYACTIVITY=2, NOTIFYSILENCE=3 };
-class TEmulation : public QObject
+class TEmulation : public TQObject
{ TQ_OBJECT
public:
diff --git a/konsole/konsole/session.h b/konsole/konsole/session.h
index 6a8b8d065..3b5f211fa 100644
--- a/konsole/konsole/session.h
+++ b/konsole/konsole/session.h
@@ -208,7 +208,7 @@ private:
bool xon_xoff;
bool fullScripting;
- QString stateIconName;
+ TQString stateIconName;
TQString pgm;
TQStrList args;
diff --git a/ksplashml/themeengine/objkstheme.h b/ksplashml/themeengine/objkstheme.h
index 1e4bdf3ec..f6884b46f 100644
--- a/ksplashml/themeengine/objkstheme.h
+++ b/ksplashml/themeengine/objkstheme.h
@@ -26,7 +26,7 @@ class TDEConfig;
* of KSplash completely, and offers a friendlier way
* of installing custom splash screens.
*/
-class KDE_EXPORT ObjKsTheme : public QObject
+class KDE_EXPORT ObjKsTheme : public TQObject
{
TQ_OBJECT
public:
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp
index ef53bab75..9d388df63 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp
@@ -531,7 +531,7 @@ TQValueList< TQStringList > FancyPlotterSettings::sensors() const
entry << it.current()->text( 2 );
entry << it.current()->text( 3 );
entry << it.current()->text( 4 );
- QRgb rgb = it.current()->pixmap( 2 )->convertToImage().pixel( 1, 1 );
+ TQRgb rgb = it.current()->pixmap( 2 )->convertToImage().pixel( 1, 1 );
TQColor color( tqRed( rgb ), tqGreen( rgb ), tqBlue( rgb ) );
entry << ( color.name() );
diff --git a/ksysguard/gui/ksgrd/SensorAgent.h b/ksysguard/gui/ksgrd/SensorAgent.h
index b9871f9f0..14b9bc014 100644
--- a/ksysguard/gui/ksgrd/SensorAgent.h
+++ b/ksysguard/gui/ksgrd/SensorAgent.h
@@ -43,7 +43,7 @@ class SensorRequest;
ksysguardd. The current implementation only allowes one pending
requests. Incoming requests are queued in an input FIFO.
*/
-class KDE_EXPORT SensorAgent : public QObject
+class KDE_EXPORT SensorAgent : public TQObject
{
TQ_OBJECT
diff --git a/ksysguard/gui/ksgrd/SensorManager.h b/ksysguard/gui/ksgrd/SensorManager.h
index 829eea5d1..906358c0d 100644
--- a/ksysguard/gui/ksgrd/SensorManager.h
+++ b/ksysguard/gui/ksgrd/SensorManager.h
@@ -43,7 +43,7 @@ class SensorManagerIterator;
connection yet or the hostname is empty, a dialog will be shown to
enter the connections details.
*/
-class KDE_EXPORT SensorManager : public QObject
+class KDE_EXPORT SensorManager : public TQObject
{
TQ_OBJECT
diff --git a/ksysguard/gui/ksgrd/StyleEngine.h b/ksysguard/gui/ksgrd/StyleEngine.h
index 4d07a60c0..15a968eb6 100644
--- a/ksysguard/gui/ksgrd/StyleEngine.h
+++ b/ksysguard/gui/ksgrd/StyleEngine.h
@@ -38,7 +38,7 @@ class StyleSettings;
namespace KSGRD {
-class KDE_EXPORT StyleEngine : public QObject
+class KDE_EXPORT StyleEngine : public TQObject
{
TQ_OBJECT
diff --git a/kxkb/kxkbtraywindow.h b/kxkb/kxkbtraywindow.h
index eb6a426a2..7d1412ae7 100644
--- a/kxkb/kxkbtraywindow.h
+++ b/kxkb/kxkbtraywindow.h
@@ -28,7 +28,7 @@ class XkbRules;
catching keyboard/mouse events and displaying menu when selected
*/
-class KxkbLabelController: public QObject
+class KxkbLabelController: public TQObject
{
// TQ_OBJECT
diff --git a/kxkb/pixmap.cpp b/kxkb/pixmap.cpp
index c7e08a741..45fb935ec 100644
--- a/kxkb/pixmap.cpp
+++ b/kxkb/pixmap.cpp
@@ -292,8 +292,8 @@ void LayoutIcon::dimPixmap(TQPixmap& pm)
for (int y=0; y
class GlibEvents
- : public QWidget
+ : public TQWidget
{
TQ_OBJECT
public:
diff --git a/tdeioslave/finger/tdeio_finger.h b/tdeioslave/finger/tdeio_finger.h
index 2dff90d3a..079c82305 100644
--- a/tdeioslave/finger/tdeio_finger.h
+++ b/tdeioslave/finger/tdeio_finger.h
@@ -46,12 +46,12 @@ private slots:
private:
KURL *myURL;
- QString *myPerlPath;
+ TQString *myPerlPath;
TQString *myFingerPath;
TQString *myFingerPerlScript;
TQString *myFingerCSSFile;
- QString *myStdStream;
+ TQString *myStdStream;
TDEProcess *myTDEProcess;
diff --git a/tdeioslave/home/homeimpl.h b/tdeioslave/home/homeimpl.h
index 72e2668ba..abc106bcb 100644
--- a/tdeioslave/home/homeimpl.h
+++ b/tdeioslave/home/homeimpl.h
@@ -27,7 +27,7 @@
#include
-class HomeImpl : public QObject
+class HomeImpl : public TQObject
{
TQ_OBJECT
diff --git a/tdeioslave/mac/TODO b/tdeioslave/mac/TODO
index 69fcb0d2e..469a616be 100644
--- a/tdeioslave/mac/TODO
+++ b/tdeioslave/mac/TODO
@@ -5,7 +5,7 @@ grep TODO tdeio_mac.cpp
//TODO this means dev=foo must be the last argument in the query
//TODO this error interrupts the user when typing ?dev=foo on each letter of foo
//TODO are there any more characters to escape?
- QString theSize(fileRE.group(4)); //TODO: this is data size, what about resource size?
+ TQString theSize(fileRE.group(4)); //TODO: this is data size, what about resource size?
Future things:
- maybe make it work with plain old hfs partitions
diff --git a/tdeioslave/media/mediamanager/medialist.h b/tdeioslave/media/mediamanager/medialist.h
index 5397b37cc..a92d1b6c0 100644
--- a/tdeioslave/media/mediamanager/medialist.h
+++ b/tdeioslave/media/mediamanager/medialist.h
@@ -23,7 +23,7 @@
#include "medium.h"
-class MediaList : public QObject
+class MediaList : public TQObject
{
TQ_OBJECT
diff --git a/tdeioslave/media/tdecmodule/managermodule.cpp b/tdeioslave/media/tdecmodule/managermodule.cpp
index 813775cbd..9a443e551 100644
--- a/tdeioslave/media/tdecmodule/managermodule.cpp
+++ b/tdeioslave/media/tdecmodule/managermodule.cpp
@@ -91,7 +91,7 @@ void ManagerModule::load()
else
view->option_atime->setNoChange();
- QString value;
+ TQString value;
value = config.readEntry("shortname", "lower").lower();
for (int i = 0; i < view->option_shortname->count(); i++)
diff --git a/tdeioslave/thumbnail/thumbnail.cpp b/tdeioslave/thumbnail/thumbnail.cpp
index cc2eefbc3..98b01138c 100644
--- a/tdeioslave/thumbnail/thumbnail.cpp
+++ b/tdeioslave/thumbnail/thumbnail.cpp
@@ -428,7 +428,7 @@ const TQImage& ThumbnailProtocol::getIcon()
int h = icon->height();
for ( int y = 0; y < h; y++ )
{
- QRgb *line = (QRgb *) icon->scanLine( y );
+ TQRgb *line = (TQRgb *) icon->scanLine( y );
for ( int x = 0; x < w; x++ )
line[x] &= m_iconAlpha; // transparency
}
diff --git a/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS b/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS
index f4e10f262..7ada25041 100644
--- a/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS
+++ b/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS
@@ -1,4 +1,4 @@
tdefile_trash
===========
-QString OriginalPath
+TQString OriginalPath
DateTime DateOfDeletion
diff --git a/tdeioslave/trash/testtrash.h b/tdeioslave/trash/testtrash.h
index a7e093b48..1b46e3551 100644
--- a/tdeioslave/trash/testtrash.h
+++ b/tdeioslave/trash/testtrash.h
@@ -22,7 +22,7 @@
#include
-class TestTrash : public QObject
+class TestTrash : public TQObject
{
TQ_OBJECT
diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp
index cdf1fc225..05ef4c6bc 100644
--- a/tdeprint/kjobviewer/kjobviewer.cpp
+++ b/tdeprint/kjobviewer/kjobviewer.cpp
@@ -114,7 +114,7 @@ void KJobViewerApp::initialize()
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
bool showIt = args->isSet("show");
bool all = args->isSet("all");
- QString prname = args->getOption("d");
+ TQString prname = args->getOption("d");
KMJobViewer *view(0);
if (!m_timer)
diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp
index 102951ffd..6ee4bbc4a 100644
--- a/tdeprint/kprinter/printwrapper.cpp
+++ b/tdeprint/kprinter/printwrapper.cpp
@@ -395,7 +395,7 @@ void PrintWrapper::slotPrintRequested(KPrinter *kprinter)
// if nobody complains.
/*else
{
- QString msg = i18n("File(s) sent to printer %1.").arg(kprinter->printerName());
+ TQString msg = i18n("File(s) sent to printer %1.").arg(kprinter->printerName());
showmsg(msg,0);
}*/
}
diff --git a/tdm/kfrontend/themer/tdmpixmap.cpp b/tdm/kfrontend/themer/tdmpixmap.cpp
index 079135c1d..fa9e0fcf5 100644
--- a/tdm/kfrontend/themer/tdmpixmap.cpp
+++ b/tdm/kfrontend/themer/tdmpixmap.cpp
@@ -303,9 +303,9 @@ KdmPixmap::drawContents( TQPainter *p, const TQRect &r )
float tint_alpha = pClass->alpha;
for (int y = 0; y < h; ++y) {
- QRgb *ls = (QRgb *)scaledImage.scanLine( y );
+ TQRgb *ls = (TQRgb *)scaledImage.scanLine( y );
for (int x = 0; x < w; ++x) {
- QRgb l = ls[x];
+ TQRgb l = ls[x];
int r = int( tqRed( l ) * tint_red );
int g = int( tqGreen( l ) * tint_green );
int b = int( tqBlue( l ) * tint_blue );
diff --git a/twin/README b/twin/README
index 8d61c7163..d2fb31c75 100644
--- a/twin/README
+++ b/twin/README
@@ -163,16 +163,16 @@ WM_TRANSIENT_FOR property is manually set using the XSetTransientForHint()
call (see tdelibs/tdeioslave/http/kcookiejar/kcookiewin.cpp). The arguments
to XSetTransientForHint() call are the X display (i.e. qt_xdisplay()),
the window id on which the WM_TRANSIENT_FOR property is to be set
-(i.e. use QWidget::winId()), and the window id of the mainwindow.
+(i.e. use TQWidget::winId()), and the window id of the mainwindow.
Simple short HOWTO:
To put it simply: Let's say you have a daemon application that has
-DCOP call "showDialog( QString text )", and when this is called, it shows
+DCOP call "showDialog( TQString text )", and when this is called, it shows
a dialog with the given text. This won't work properly with focus stealing
prevention. The DCOP call should be changed to
-"showDialog( QString text, long id )". The caller should pass something like
+"showDialog( TQString text, long id )". The caller should pass something like
myMainWindow->winId() as the second argument. In the daemon, before
the dialog is shown, a call to XSetTransientHint() should be added:
diff --git a/twin/client.cpp b/twin/client.cpp
index 8c303ec15..044d89208 100644
--- a/twin/client.cpp
+++ b/twin/client.cpp
@@ -1260,7 +1260,7 @@ void Client::drawShadow()
removeShadow();
- TQMemArray pixelData;
+ TQMemArray pixelData;
TQPixmap shadowPixmap;
TQRect shadow;
TQRegion exposedRegion;
@@ -1433,7 +1433,7 @@ TQRegion Client::getExposedRegion(TQRegion occludedRegion, int x, int y, int w,
*/
void Client::imposeCachedShadow(TQPixmap &pixmap, TQRegion exposed)
{
- QRgb pixel;
+ TQRgb pixel;
double opacity;
int red, green, blue, pixelRed, pixelGreen, pixelBlue;
int subW, subH, w, x, y, zeroX, zeroY;
@@ -1490,7 +1490,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded,
TQRegion exposed, int thickness, double maxOpacity)
{
int distance, intersectCount, i, j, x, y;
- QRgb pixel;
+ TQRgb pixel;
double decay, factor, opacity;
int red, green, blue, pixelRed, pixelGreen, pixelBlue;
int lineIntersects, maxIntersects, maxY;
diff --git a/twin/clients/PORTING b/twin/clients/PORTING
index e6a18a7a1..199ddb9de 100644
--- a/twin/clients/PORTING
+++ b/twin/clients/PORTING
@@ -9,7 +9,7 @@ Makefile.am:
Sources:
- There are no twin/something.h includes, and don't use the KWinInternal namespace.
- Use QToolTip instead of KWinToolTip.
-- Use QButton instead of KWinButton, QToolButton instead of KWinToolButton and QWidget
+- Use QButton instead of KWinButton, QToolButton instead of KWinToolButton and TQWidget
instead of KWinWidgetButton.
- For tooltips, use simply QToolTip::add().
- Change Client* to MyClient* (or whatever is your main client class) in your MyButton.
@@ -22,11 +22,11 @@ Sources:
- As the first thing in init(), call createMainWidget(); if your client class took some
flags such as WResizeNoErase, pass them to this function.
- Then, do 'widget()->installEventFilter( this );'.
-- Implement MyClient::eventFilter() - as MyClient is now no longer QWidget, you need the event
+- Implement MyClient::eventFilter() - as MyClient is now no longer TQWidget, you need the event
filter to call all the functions that used to be called directly. Usually, it's something
like:
=====
-bool MyClient::eventFilter( QObject* o, QEvent* e )
+bool MyClient::eventFilter( TQObject* o, QEvent* e )
{
if ( o != widget() )
return false;
@@ -63,7 +63,7 @@ bool MyClient::eventFilter( QObject* o, QEvent* e )
}
=====
- In MyClient, 'this' will have to be often replaced with 'widget()', pay special attention
- to cases where this won't cause compile error (e.g. in connect() calls, which take QObject* ).
+ to cases where this won't cause compile error (e.g. in connect() calls, which take TQObject* ).
- Also, many calls may need 'widget()->' prepended.
- Layout is created in init(), so call createLayout() directly there (if it's implemented).
- Remove calls to Client methods (Client::resizeEvent() and so on).
diff --git a/twin/clients/keramik/embedtool.cpp b/twin/clients/keramik/embedtool.cpp
index 88cf93838..8d39f9650 100644
--- a/twin/clients/keramik/embedtool.cpp
+++ b/twin/clients/keramik/embedtool.cpp
@@ -101,7 +101,7 @@ void KeramikEmbedder::embed( const char *name )
codename = codename.replace( TQRegExp("[^a-zA-Z0-9]"), "_" );
- stream << "\tstatic const QRgb " << codename << "_data[] = {" << endl << "\t\t";
+ stream << "\tstatic const TQRgb " << codename << "_data[] = {" << endl << "\t\t";
stream.setf( TQTextStream::hex | TQTextStream::right );
stream.fill( '0' );
@@ -147,7 +147,7 @@ void KeramikEmbedder::writeIndex()
stream << "\t\tint width;\n";
stream << "\t\tint height;\n";
stream << "\t\tbool alpha;\n";
- stream << "\t\tconst QRgb *data;\n";
+ stream << "\t\tconst TQRgb *data;\n";
stream << "\t};\n\n";
uint i = 0;
diff --git a/twin/clients/plastik/misc.cpp b/twin/clients/plastik/misc.cpp
index 1b259d383..053cf15ea 100644
--- a/twin/clients/plastik/misc.cpp
+++ b/twin/clients/plastik/misc.cpp
@@ -54,8 +54,8 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i
{
// normal button...
- QRgb rgb = bgColor.rgb();
- QRgb rgb_b = fgColor.rgb();
+ TQRgb rgb = bgColor.rgb();
+ TQRgb rgb_b = fgColor.rgb();
int alpha = a;
if(alpha>255) alpha = 255;
if(alpha<0) alpha = 0;
diff --git a/twin/clients/plastik/plastikbutton.h b/twin/clients/plastik/plastikbutton.h
index 6da87100f..6deaa56f6 100644
--- a/twin/clients/plastik/plastikbutton.h
+++ b/twin/clients/plastik/plastikbutton.h
@@ -65,7 +65,7 @@ private:
/**
* This class creates bitmaps which can be used as icons on buttons. The icons
* are "hardcoded".
- * Over the previous "Gimp->xpm->QImage->recolor->SmoothScale->TQPixmap" solution
+ * Over the previous "Gimp->xpm->TQImage->recolor->SmoothScale->TQPixmap" solution
* it has the important advantage that icons are more scalable and at the same
* time sharp and not blurred.
*/
diff --git a/twin/sm.h b/twin/sm.h
index c1542e721..951db4e32 100644
--- a/twin/sm.h
+++ b/twin/sm.h
@@ -59,7 +59,7 @@ enum SMSavePhase
};
class SessionSaveDoneHelper
- : public QObject
+ : public TQObject
{
TQ_OBJECT
public:
diff --git a/twin/tools/decobenchmark/preview.h b/twin/tools/decobenchmark/preview.h
index d69a2f57f..38cd08b19 100644
--- a/twin/tools/decobenchmark/preview.h
+++ b/twin/tools/decobenchmark/preview.h
@@ -30,7 +30,7 @@ class KDecorationPreviewBridge;
class KDecorationPreviewOptions;
class KDecorationPreview
- : public QWidget
+ : public TQWidget
{
public:
KDecorationPreview( KDecorationPlugins* plugin, TQWidget* parent = NULL, const char* name = NULL );