summaryrefslogtreecommitdiffstats
path: root/kutils
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-13 08:32:36 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-13 08:32:36 +0000
commitf7e71d47719ab6094cf4a9fafffa5ea351973522 (patch)
tree30834aa632d442019e14f88685001d94657d060b /kutils
parentb31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff)
downloadtdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz
tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems with dependent modules such as kdebase. If it does then it needs to be fixed! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kutils')
-rw-r--r--kutils/kcmoduleinfo.cpp4
-rw-r--r--kutils/kcmoduleloader.cpp4
-rw-r--r--kutils/kcmoduleproxy.cpp30
-rw-r--r--kutils/kcmoduleproxy.h2
-rw-r--r--kutils/kcmultidialog.cpp8
-rw-r--r--kutils/kcmultidialog.h2
-rw-r--r--kutils/kfind.cpp22
-rw-r--r--kutils/kfind.h5
-rw-r--r--kutils/kfinddialog.cpp4
-rw-r--r--kutils/kmultitabbar.cpp114
-rw-r--r--kutils/kmultitabbar.h6
-rw-r--r--kutils/kmultitabbar_p.h2
-rw-r--r--kutils/kpluginselector.cpp24
-rw-r--r--kutils/kpluginselector.h2
-rw-r--r--kutils/kpluginselector_p.h2
-rw-r--r--kutils/kreplace.cpp10
-rw-r--r--kutils/kreplace.h2
-rw-r--r--kutils/kreplacedialog.cpp2
-rw-r--r--kutils/ksettings/componentsdialog.cpp4
-rw-r--r--kutils/ksettings/dialog.cpp8
-rw-r--r--kutils/ksettings/dialog.h2
-rw-r--r--kutils/ksettings/dispatcher.cpp6
-rw-r--r--kutils/ksettings/dispatcher.h2
-rw-r--r--kutils/tests/kfindtest.h2
-rw-r--r--kutils/tests/kreplacetest.cpp4
-rw-r--r--kutils/tests/kreplacetest.h2
26 files changed, 138 insertions, 137 deletions
diff --git a/kutils/kcmoduleinfo.cpp b/kutils/kcmoduleinfo.cpp
index fe2545a39..bb27f5c69 100644
--- a/kutils/kcmoduleinfo.cpp
+++ b/kutils/kcmoduleinfo.cpp
@@ -179,7 +179,7 @@ KCModuleInfo::loadAll()
setNeedsTest( tmp.isValid() ? tmp.asBool() : false );
}
-QString
+TQString
KCModuleInfo::docPath() const
{
if (!_allLoaded)
@@ -188,7 +188,7 @@ KCModuleInfo::docPath() const
return _doc;
}
-QString
+TQString
KCModuleInfo::handle() const
{
if (!_allLoaded)
diff --git a/kutils/kcmoduleloader.cpp b/kutils/kcmoduleloader.cpp
index de1843b7c..642e6f1bc 100644
--- a/kutils/kcmoduleloader.cpp
+++ b/kutils/kcmoduleloader.cpp
@@ -72,7 +72,7 @@ KCModule* KCModuleLoader::load(const KCModuleInfo &mod, const TQString &libname,
KLibFactory *factory = lib->factory();
if ( factory )
{
- KCModule *module = KParts::ComponentFactory::createInstanceFromFactory<KCModule>( factory, parent, name ? name : mod.handle().latin1(), args );
+ KCModule *module = KParts::ComponentFactory::createInstanceFromFactory<KCModule>( factory, TQT_TQOBJECT(parent), name ? name : mod.handle().latin1(), args );
if (module)
return module;
}
@@ -257,7 +257,7 @@ bool KCModuleLoader::testModule( const KCModuleInfo& module )
KLibrary* library = loader->library( TQFile::encodeName((TQString("kcm_%1").arg(module.library()))) );
if( library )
{
- void *test_func = library->symbol( TQString("test_%1").arg(module.factoryName()).utf8() );
+ void *test_func = library->symbol( TQString(TQString("test_%1").arg(module.factoryName())).utf8() );
if( test_func )
{
bool (*func)() = (bool(*)())test_func;
diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp
index 9fd95f40f..f4b4a9655 100644
--- a/kutils/kcmoduleproxy.cpp
+++ b/kutils/kcmoduleproxy.cpp
@@ -90,18 +90,18 @@ class KCModuleProxy::KCModuleProxyPrivate
delete kcm;
}
- QStringList args;
+ TQStringList args;
KCModule *kcm;
QXEmbed *embedWidget;
KProcess *rootProcess;
- QVBox *embedFrame;
- KCModuleProxyIfaceImpl *dcopObject;
+ TQVBox *embedFrame;
+ KCModuleProxyIfaceImpl *dcopObject;
DCOPClient *dcopClient;
- QVBoxLayout *topLayout; /* Contains TQScrollView view, and root stuff */
- KCModuleProxyRootCommunicatorImpl *rootCommunicator;
- QLabel *rootInfo;
- QCString dcopName;
- KCModuleInfo modInfo;
+ TQVBoxLayout *topLayout; /* Contains TQScrollView view, and root stuff */
+ KCModuleProxyRootCommunicatorImpl *rootCommunicator;
+ TQLabel *rootInfo;
+ TQCString dcopName;
+ KCModuleInfo modInfo;
bool withFallback;
bool changed;
bool rootMode;
@@ -161,7 +161,7 @@ KCModule * KCModuleProxy::realModule() const
if( !d->isInitialized )
{
- d->dcopName = moduleInfo().handle().prepend("KCModuleProxy-").utf8();
+ d->dcopName = TQString(moduleInfo().handle().prepend("KCModuleProxy-")).utf8();
d->topLayout = new TQVBoxLayout( that, 0, 0, "topLayout" );
d->isInitialized = true;
@@ -311,7 +311,7 @@ void KCModuleProxy::runAsRoot()
TQPalette pal( red );
pal.setColor( TQColorGroup::Background,
- colorGroup().background() );
+ tqcolorGroup().background() );
d->embedFrame->setPalette( pal );
d->embedFrame->setLineWidth( 2 );
d->embedFrame->setMidLineWidth( 2 );
@@ -323,7 +323,7 @@ void KCModuleProxy::runAsRoot()
TQLabel *lblBusy = new TQLabel(i18n("<big>Loading...</big>"), d->embedWidget, "lblBusy" );
lblBusy->setTextFormat(RichText);
- lblBusy->setAlignment(AlignCenter);
+ lblBusy->tqsetAlignment(AlignCenter);
lblBusy->setGeometry(0,0, d->kcm->width(), d->kcm->height());
lblBusy->show();
@@ -343,15 +343,15 @@ void KCModuleProxy::runAsRoot()
TQString cmd = moduleInfo().service()->exec().stripWhiteSpace();
if (cmd.left(5) == "kdesu")
{
- cmd = cmd.remove(0,5).stripWhiteSpace();
+ cmd = TQString(cmd.remove(0,5)).stripWhiteSpace();
/* Remove all kdesu switches */
while( cmd.length() > 1 && cmd[ 0 ] == '-' )
- cmd = cmd.remove( 0, cmd.find( ' ' ) ).stripWhiteSpace();
+ cmd = TQString(cmd.remove( 0, cmd.tqfind( ' ' ) )).stripWhiteSpace();
}
if (cmd.left(8) == "kcmshell")
- cmd = cmd.remove(0,8).stripWhiteSpace();
+ cmd = TQString(cmd.remove(0,8)).stripWhiteSpace();
/* Run the process */
TQString kdesu = KStandardDirs::findExe("kdesu");
@@ -416,7 +416,7 @@ void KCModuleProxy::rootExited()
/* Such that the "ordinary" module loads again */
d->rootMode = false;
- d->topLayout->invalidate();
+ d->topLayout->tqinvalidate();
TQShowEvent ev;
showEvent( &ev );
diff --git a/kutils/kcmoduleproxy.h b/kutils/kcmoduleproxy.h
index d615edc1e..fea2cf47e 100644
--- a/kutils/kcmoduleproxy.h
+++ b/kutils/kcmoduleproxy.h
@@ -65,7 +65,7 @@ class KProcess;
* @author Matthias Kretz <kretz@kde.org>
*
*/
-class KUTILS_EXPORT KCModuleProxy : public QWidget
+class KUTILS_EXPORT KCModuleProxy : public TQWidget
{
Q_OBJECT
diff --git a/kutils/kcmultidialog.cpp b/kutils/kcmultidialog.cpp
index 33f243529..217f40bd4 100644
--- a/kutils/kcmultidialog.cpp
+++ b/kutils/kcmultidialog.cpp
@@ -148,7 +148,7 @@ void KCMultiDialog::apply()
TQStringList * names = moduleParentComponents[ m ];
kdDebug(710) << k_funcinfo << *names << " saved and added to the list" << endl;
for( TQStringList::ConstIterator it = names->begin(); it != names->end(); ++it )
- if( updatedModules.find( *it ) == updatedModules.end() )
+ if( updatedModules.tqfind( *it ) == updatedModules.end() )
updatedModules.append( *it );
}
}
@@ -275,7 +275,7 @@ void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo,
return;
}
KCModuleProxy * module;
- if( m_orphanModules.contains( moduleinfo.service() ) )
+ if( m_orphanModules.tqcontains( moduleinfo.service() ) )
{
// the KCModule already exists - it was removed from the dialog in
// removeAllModules
@@ -328,7 +328,7 @@ void KCMultiDialog::removeAllModules()
{
kdDebug( 710 ) << "remove 2" << endl;
KCModuleProxy * kcm = ( *it ).kcm;
- TQObject * page = kcm->parent();
+ TQObject * page = TQT_TQOBJECT(kcm->parent());
kcm->hide();
if( page )
{
@@ -358,7 +358,7 @@ void KCMultiDialog::slotAboutToShow(TQWidget *page)
if( ! obj )
return;
- KCModuleProxy * module = ( KCModuleProxy* )obj->qt_cast(
+ KCModuleProxy * module = ( KCModuleProxy* )obj->tqqt_cast(
"KCModuleProxy" );
if( ! module )
return;
diff --git a/kutils/kcmultidialog.h b/kutils/kcmultidialog.h
index df1707a9a..ab57012ad 100644
--- a/kutils/kcmultidialog.h
+++ b/kutils/kcmultidialog.h
@@ -136,7 +136,7 @@ public:
* @param withfallback Try harder to load the module. Might result
* in the module appearing outside the dialog.
**/
- void addModule(const KCModuleInfo& moduleinfo, QStringList
+ void addModule(const KCModuleInfo& moduleinfo, TQStringList
parentmodulenames = TQStringList(), bool withfallback=false);
/**
diff --git a/kutils/kfind.cpp b/kutils/kfind.cpp
index 7b2da6899..d47b1c4a2 100644
--- a/kutils/kfind.cpp
+++ b/kutils/kfind.cpp
@@ -211,7 +211,7 @@ KDialogBase* KFind::findNextDialog( bool create )
{
if ( !m_dialog && create )
{
- m_dialog = new KFindNextDialog( m_pattern, parentWidget() );
+ m_dialog = new KFindNextDialog( m_pattern, tqparentWidget() );
connect( m_dialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotFindNext() ) );
connect( m_dialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogClosed() ) );
}
@@ -368,7 +368,7 @@ KFind::Result KFind::find()
delete d->emptyMatch;
d->emptyMatch = new Private::Match( d->currentId, m_index, m_matchedLength );
} else
- d->incrementalPath.replace(m_pattern, new Private::Match(d->currentId, m_index, m_matchedLength));
+ d->incrementalPath.tqreplace(m_pattern, new Private::Match(d->currentId, m_index, m_matchedLength));
if ( m_pattern.length() < d->matchedPattern.length() )
{
@@ -471,7 +471,7 @@ int KFind::find(const TQString &text, const TQString &pattern, int index, long o
while (index >= 0)
{
// ...find the next match.
- index = text.findRev(pattern, index, caseSensitive);
+ index = text.tqfindRev(pattern, index, caseSensitive);
if (index == -1)
break;
@@ -488,7 +488,7 @@ int KFind::find(const TQString &text, const TQString &pattern, int index, long o
while (index < (int)text.length())
{
// ...find the next match.
- index = text.find(pattern, index, caseSensitive);
+ index = text.tqfind(pattern, index, caseSensitive);
if (index == -1)
break;
@@ -507,11 +507,11 @@ int KFind::find(const TQString &text, const TQString &pattern, int index, long o
// Non-whole-word search.
if (options & KFindDialog::FindBackwards)
{
- index = text.findRev(pattern, index, caseSensitive);
+ index = text.tqfindRev(pattern, index, caseSensitive);
}
else
{
- index = text.find(pattern, index, caseSensitive);
+ index = text.tqfind(pattern, index, caseSensitive);
}
if (index != -1)
{
@@ -532,7 +532,7 @@ int KFind::find(const TQString &text, const TQRegExp &pattern, int index, long o
while (index >= 0)
{
// ...find the next match.
- index = text.findRev(pattern, index);
+ index = text.tqfindRev(pattern, index);
if (index == -1)
break;
@@ -551,7 +551,7 @@ int KFind::find(const TQString &text, const TQRegExp &pattern, int index, long o
while (index < (int)text.length())
{
// ...find the next match.
- index = text.find(pattern, index);
+ index = text.tqfind(pattern, index);
if (index == -1)
break;
@@ -572,11 +572,11 @@ int KFind::find(const TQString &text, const TQRegExp &pattern, int index, long o
// Non-whole-word search.
if (options & KFindDialog::FindBackwards)
{
- index = text.findRev(pattern, index);
+ index = text.tqfindRev(pattern, index);
}
else
{
- index = text.find(pattern, index);
+ index = text.tqfind(pattern, index);
}
if (index != -1)
{
@@ -704,7 +704,7 @@ TQWidget* KFind::dialogsParent() const
// If the find dialog is still up, it should get the focus when closing a message box
// Otherwise, maybe the "find next?" dialog is up
// Otherwise, the "view" is the parent.
- return d->findDialog ? (TQWidget*)d->findDialog : ( m_dialog ? m_dialog : parentWidget() );
+ return d->findDialog ? (TQWidget*)d->findDialog : ( m_dialog ? m_dialog : tqparentWidget() );
}
#include "kfind.moc"
diff --git a/kutils/kfind.h b/kutils/kfind.h
index 502708dd1..b28f59596 100644
--- a/kutils/kfind.h
+++ b/kutils/kfind.h
@@ -101,9 +101,10 @@
* FindBackwards and call slotFindNext() - and reset the value afterwards.
*/
class KUTILS_EXPORT KFind :
- public QObject
+ public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -388,7 +389,7 @@ signals:
protected:
- TQWidget* parentWidget() const { return (TQWidget *)parent(); }
+ TQWidget* tqparentWidget() const { return (TQWidget *)parent(); }
TQWidget* dialogsParent() const;
protected slots:
diff --git a/kutils/kfinddialog.cpp b/kutils/kfinddialog.cpp
index 7cc6dff46..c23380696 100644
--- a/kutils/kfinddialog.cpp
+++ b/kutils/kfinddialog.cpp
@@ -423,13 +423,13 @@ void KFindDialog::showPatterns()
{
if ( !d->m_regexpDialogQueryDone )
{
- d->m_regexpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString::null, this );
+ d->m_regexpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
d->m_regexpDialogQueryDone = true;
}
if ( d->m_regexpDialog )
{
- KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( d->m_regexpDialog->qt_cast( "KRegExpEditorInterface" ) );
+ KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( d->m_regexpDialog->tqqt_cast( "KRegExpEditorInterface" ) );
assert( iface );
iface->setRegExp( pattern() );
diff --git a/kutils/kmultitabbar.cpp b/kutils/kmultitabbar.cpp
index a9b648736..53f73e942 100644
--- a/kutils/kmultitabbar.cpp
+++ b/kutils/kmultitabbar.cpp
@@ -73,7 +73,7 @@ KMultiTabBarInternal::KMultiTabBarInternal(TQWidget *parent, KMultiTabBar::KMult
}
addChild(box);
setFrameStyle(NoFrame);
- viewport()->setBackgroundMode(Qt::PaletteBackground);
+ viewport()->setBackgroundMode(TQt::PaletteBackground);
/* box->setPaletteBackgroundColor(Qt::red);
setPaletteBackgroundColor(Qt::green);*/
}
@@ -110,7 +110,7 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style)
mainLayout->setAutoAdd(true);
}
- viewport()->repaint();
+ viewport()->tqrepaint();
}
void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph )
@@ -120,9 +120,9 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
if (m_position==KMultiTabBar::Right)
{
- paint->setPen(colorGroup().shadow());
+ paint->setPen(tqcolorGroup().shadow());
paint->drawLine(0,0,0,viewport()->height());
- paint->setPen(colorGroup().background().dark(120));
+ paint->setPen(tqcolorGroup().background().dark(120));
paint->drawLine(1,0,1,viewport()->height());
@@ -130,28 +130,28 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
else
if (m_position==KMultiTabBar::Left)
{
- paint->setPen(colorGroup().light());
+ paint->setPen(tqcolorGroup().light());
paint->drawLine(23,0,23,viewport()->height());
paint->drawLine(22,0,22,viewport()->height());
- paint->setPen(colorGroup().shadow());
+ paint->setPen(tqcolorGroup().shadow());
paint->drawLine(0,0,0,viewport()->height());
}
else
if (m_position==KMultiTabBar::Bottom)
{
- paint->setPen(colorGroup().shadow());
+ paint->setPen(tqcolorGroup().shadow());
paint->drawLine(0,0,viewport()->width(),0);
- paint->setPen(colorGroup().background().dark(120));
+ paint->setPen(tqcolorGroup().background().dark(120));
paint->drawLine(0,1,viewport()->width(),1);
}
else
{
- paint->setPen(colorGroup().light());
+ paint->setPen(tqcolorGroup().light());
paint->drawLine(0,23,viewport()->width(),23);
paint->drawLine(0,22,viewport()->width(),22);
-/* paint->setPen(colorGroup().shadow());
+/* paint->setPen(tqcolorGroup().shadow());
paint->drawLine(0,0,0,viewport()->height());*/
}
@@ -378,7 +378,7 @@ void KMultiTabBarInternal::setPosition(enum KMultiTabBar::KMultiTabBarPosition p
m_position=pos;
for (uint i=0;i<m_tabs.count();i++)
m_tabs.at(i)->setTabsPosition(m_position);
- viewport()->repaint();
+ viewport()->tqrepaint();
}
KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text, TQPopupMenu *popup,
@@ -434,29 +434,29 @@ void KMultiTabBarButton::slotClicked()
void KMultiTabBarButton::setPosition(KMultiTabBar::KMultiTabBarPosition pos)
{
m_position=pos;
- repaint();
+ tqrepaint();
}
void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style)
{
m_style=style;
- repaint();
+ tqrepaint();
}
void KMultiTabBarButton::hideEvent( TQHideEvent* he) {
TQPushButton::hideEvent(he);
- KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget());
+ KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(tqparentWidget());
if (tb) tb->updateSeparator();
}
void KMultiTabBarButton::showEvent( TQShowEvent* he) {
TQPushButton::showEvent(he);
- KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget());
+ KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(tqparentWidget());
if (tb) tb->updateSeparator();
}
-TQSize KMultiTabBarButton::sizeHint() const
+TQSize KMultiTabBarButton::tqsizeHint() const
{
constPolish();
@@ -472,7 +472,7 @@ TQSize KMultiTabBarButton::sizeHint() const
}
#endif
if ( isMenuButton() )
- w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+ w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
if ( pixmap() ) {
TQPixmap *pm = (TQPixmap *)pixmap();
@@ -482,7 +482,7 @@ TQSize KMultiTabBarButton::sizeHint() const
TQString s( text() );
bool empty = s.isEmpty();
if ( empty )
- s = TQString::fromLatin1("XXXX");
+ s = TQString::tqfromLatin1("XXXX");
TQFontMetrics fm = fontMetrics();
TQSize sz = fm.size( ShowPrefix, s );
if(!empty || !w)
@@ -491,7 +491,7 @@ TQSize KMultiTabBarButton::sizeHint() const
h = QMAX(h, sz.height());
}
- return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
+ return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
expandedTo(TQApplication::globalStrut()));
}
@@ -525,7 +525,7 @@ void KMultiTabBarTab::setTabsPosition(KMultiTabBar::KMultiTabBarPosition pos)
}
setPosition(pos);
-// repaint();
+// tqrepaint();
}
void KMultiTabBarTab::setIcon(const TQString& icon)
@@ -577,12 +577,12 @@ void KMultiTabBarTab::updateState()
if ((m_position==KMultiTabBar::Right || m_position==KMultiTabBar::Left)) {
setFixedWidth(24);
if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
- setFixedHeight(KMultiTabBarButton::sizeHint().width());
+ setFixedHeight(KMultiTabBarButton::tqsizeHint().width());
} else setFixedHeight(36);
} else {
setFixedHeight(24);
if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
- setFixedWidth(KMultiTabBarButton::sizeHint().width());
+ setFixedWidth(KMultiTabBarButton::tqsizeHint().width());
} else setFixedWidth(36);
}
} else {
@@ -633,7 +633,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
const int height = 24;
if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
if ((m_position==KMultiTabBar::Left) || (m_position==KMultiTabBar::Right))
- sh=TQSize(this->height(),this->width());//KMultiTabBarButton::sizeHint();
+ sh=TQSize(this->height(),this->width());//KMultiTabBarButton::tqsizeHint();
else sh=TQSize(this->width(),this->height());
}
else
@@ -650,8 +650,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
if (isOn()) st|=TQStyle::Style_On;
- style().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
- style().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
+ tqstyle().tqdrawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st);
+ tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st);
switch (m_position) {
case KMultiTabBar::Left:
@@ -667,8 +667,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
paint->drawPixmap(0,0,pixmap);
break;
}
-// style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
-// colorGroup(),TQStyle::Style_Enabled);
+// tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
+// tqcolorGroup(),TQStyle::Style_Enabled);
}
@@ -678,58 +678,58 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
TQPixmap pixmap;
if ( iconSet())
pixmap = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal );
- paint->fillRect(0, 0, 24, 24, colorGroup().background());
+ paint->fillRect(0, 0, 24, 24, tqcolorGroup().background());
if (!isOn())
{
if (m_position==KMultiTabBar::Right)
{
- paint->fillRect(0,0,21,21,TQBrush(colorGroup().background()));
+ paint->fillRect(0,0,21,21,TQBrush(tqcolorGroup().background()));
- paint->setPen(colorGroup().background().dark(150));
+ paint->setPen(tqcolorGroup().background().dark(150));
paint->drawLine(0,22,23,22);
paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
- paint->setPen(colorGroup().shadow());
+ paint->setPen(tqcolorGroup().shadow());
paint->drawLine(0,0,0,23);
- paint->setPen(colorGroup().background().dark(120));
+ paint->setPen(tqcolorGroup().background().dark(120));
paint->drawLine(1,0,1,23);
}
else
if ((m_position==KMultiTabBar::Bottom) || (m_position==KMultiTabBar::Top))
{
- paint->fillRect(0,1,23,22,TQBrush(colorGroup().background()));
+ paint->fillRect(0,1,23,22,TQBrush(tqcolorGroup().background()));
paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
- paint->setPen(colorGroup().background().dark(120));
+ paint->setPen(tqcolorGroup().background().dark(120));
paint->drawLine(23,0,23,23);
- paint->setPen(colorGroup().light());
+ paint->setPen(tqcolorGroup().light());
paint->drawLine(0,22,23,22);
paint->drawLine(0,23,23,23);
- paint->setPen(colorGroup().shadow());
+ paint->setPen(tqcolorGroup().shadow());
paint->drawLine(0,0,23,0);
- paint->setPen(colorGroup().background().dark(120));
+ paint->setPen(tqcolorGroup().background().dark(120));
paint->drawLine(0,1,23,1);
}
else
{
- paint->setPen(colorGroup().background().dark(120));
+ paint->setPen(tqcolorGroup().background().dark(120));
paint->drawLine(0,23,23,23);
- paint->fillRect(0,0,23,21,TQBrush(colorGroup().background()));
+ paint->fillRect(0,0,23,21,TQBrush(tqcolorGroup().background()));
paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
- paint->setPen(colorGroup().light());
+ paint->setPen(tqcolorGroup().light());
paint->drawLine(23,0,23,23);
paint->drawLine(22,0,22,23);
- paint->setPen(colorGroup().shadow());
+ paint->setPen(tqcolorGroup().shadow());
paint->drawLine(0,0,0,23);
}
@@ -740,12 +740,12 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
{
if (m_position==KMultiTabBar::Right)
{
- paint->setPen(colorGroup().shadow());
+ paint->setPen(tqcolorGroup().shadow());
paint->drawLine(0,height()-1,23,height()-1);
paint->drawLine(0,height()-2,23,height()-2);
paint->drawLine(23,0,23,height()-1);
paint->drawLine(22,0,22,height()-1);
- paint->fillRect(0,0,21,height()-3,TQBrush(colorGroup().light()));
+ paint->fillRect(0,0,21,height()-3,TQBrush(tqcolorGroup().light()));
paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
if (m_showActiveTabText)
@@ -755,9 +755,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
TQPixmap tpixmap(height()-25-3, width()-2);
TQPainter painter(&tpixmap);
- painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
+ painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
- painter.setPen(colorGroup().text());
+ painter.setPen(tqcolorGroup().text());
painter.drawText(0,+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
paint->rotate(90);
@@ -769,25 +769,25 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
else
if (m_position==KMultiTabBar::Top)
{
- paint->fillRect(0,0,width()-1,23,TQBrush(colorGroup().light()));
+ paint->fillRect(0,0,width()-1,23,TQBrush(tqcolorGroup().light()));
paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
if (m_showActiveTabText)
{
- paint->setPen(colorGroup().text());
+ paint->setPen(tqcolorGroup().text());
paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
}
}
else
if (m_position==KMultiTabBar::Bottom)
{
- paint->setPen(colorGroup().shadow());
+ paint->setPen(tqcolorGroup().shadow());
paint->drawLine(0,23,width()-1,23);
paint->drawLine(0,22,width()-1,22);
- paint->fillRect(0,0,width()-1,21,TQBrush(colorGroup().light()));
+ paint->fillRect(0,0,width()-1,21,TQBrush(tqcolorGroup().light()));
paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
if (m_showActiveTabText)
{
- paint->setPen(colorGroup().text());
+ paint->setPen(tqcolorGroup().text());
paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
}
@@ -796,10 +796,10 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
{
- paint->setPen(colorGroup().shadow());
+ paint->setPen(tqcolorGroup().shadow());
paint->drawLine(0,height()-1,23,height()-1);
paint->drawLine(0,height()-2,23,height()-2);
- paint->fillRect(0,0,23,height()-3,TQBrush(colorGroup().light()));
+ paint->fillRect(0,0,23,height()-3,TQBrush(tqcolorGroup().light()));
paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
if (m_showActiveTabText)
{
@@ -809,9 +809,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
TQPixmap tpixmap(height()-25-3, width()-2);
TQPainter painter(&tpixmap);
- painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
+ painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
- painter.setPen(colorGroup().text());
+ painter.setPen(tqcolorGroup().text());
painter.drawText(tpixmap.width()-TQFontMetrics(TQFont()).width(m_text),+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
paint->rotate(-90);
@@ -838,13 +838,13 @@ KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *nam
if (bm==Vertical)
{
m_l=new TQVBoxLayout(this);
- setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
+ tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
// setFixedWidth(24);
}
else
{
m_l=new TQHBoxLayout(this);
- setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
+ tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
// setFixedHeight(24);
}
m_l->setMargin(0);
@@ -989,7 +989,7 @@ void KMultiTabBar::fontChange(const TQFont& /* oldFont */)
{
for (uint i=0;i<tabs()->count();i++)
tabs()->at(i)->resize();
- repaint();
+ tqrepaint();
}
TQPtrList<KMultiTabBarTab>* KMultiTabBar::tabs() {return m_internal->tabs();}
diff --git a/kutils/kmultitabbar.h b/kutils/kmultitabbar.h
index f4ae54b9b..0cbbe075a 100644
--- a/kutils/kmultitabbar.h
+++ b/kutils/kmultitabbar.h
@@ -53,7 +53,7 @@ class KMultiTabBarInternal;
* should be raisable is left to the "user".
*@author Joseph Wenninger
*/
-class KUTILS_EXPORT KMultiTabBar: public QWidget
+class KUTILS_EXPORT KMultiTabBar: public TQWidget
{
Q_OBJECT
public:
@@ -202,7 +202,7 @@ private:
* This class represents a tab bar button in a KMultiTabBarWidget.
* This class should never be created except with the appendButton call of KMultiTabBar
*/
-class KUTILS_EXPORT KMultiTabBarButton: public QPushButton
+class KUTILS_EXPORT KMultiTabBarButton: public TQPushButton
{
Q_OBJECT
public:
@@ -239,7 +239,7 @@ public slots:
*/
void setText(const TQString &);
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
protected:
KMultiTabBar::KMultiTabBarPosition m_position;
diff --git a/kutils/kmultitabbar_p.h b/kutils/kmultitabbar_p.h
index e48200160..f8d552b40 100644
--- a/kutils/kmultitabbar_p.h
+++ b/kutils/kmultitabbar_p.h
@@ -27,7 +27,7 @@
#include <tqscrollview.h>
#include <kmultitabbar.h>
-class KMultiTabBarInternal: public QScrollView
+class KMultiTabBarInternal: public TQScrollView
{
Q_OBJECT
public:
diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp
index 1a64d05e9..96e853534 100644
--- a/kutils/kpluginselector.cpp
+++ b/kutils/kpluginselector.cpp
@@ -64,7 +64,7 @@
QCheckListViewItem that holds a pointer to the KPluginInfo object.
Used in the tooltip code to access additional fields
*/
-class KPluginInfoLVI : public QCheckListItem
+class KPluginInfoLVI : public TQCheckListItem
{
public:
KPluginInfoLVI( KPluginInfo *pluginInfo, KListView *parent )
@@ -83,7 +83,7 @@ private:
The decision whether or not to show tooltips is taken in
maybeTip(). See also the TQListView sources from Qt itself.
*/
-class KPluginListViewToolTip : public QToolTip
+class KPluginListViewToolTip : public TQToolTip
{
public:
KPluginListViewToolTip( TQWidget *parent, KListView *lv );
@@ -101,7 +101,7 @@ KPluginListViewToolTip::KPluginListViewToolTip( TQWidget *parent, KListView *lv
void KPluginListViewToolTip::maybeTip( const TQPoint &pos )
{
- if ( !parentWidget() || !m_listView )
+ if ( !tqparentWidget() || !m_listView )
return;
KPluginInfoLVI *item = dynamic_cast<KPluginInfoLVI *>( m_listView->itemAt( pos ) );
@@ -115,8 +115,8 @@ void KPluginListViewToolTip::maybeTip( const TQPoint &pos )
"<tr><td><b>License:</b></td><td>%4</td></tr></table></qt>" ).arg( item->pluginInfo()->comment(),
item->pluginInfo()->author(), item->pluginInfo()->version(), item->pluginInfo()->license() );
- //kdDebug( 702 ) << k_funcinfo << "Adding tooltip: itemRect: " << itemRect << ", tooltip: " << toolTip << endl;
- tip( m_listView->itemRect( item ), toolTip );
+ //kdDebug( 702 ) << k_funcinfo << "Adding tooltip: tqitemRect: " << tqitemRect << ", tooltip: " << toolTip << endl;
+ tip( m_listView->tqitemRect( item ), toolTip );
}
struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate
@@ -192,7 +192,7 @@ void KPluginSelectionWidget::init( const TQValueList<KPluginInfo*> & plugininfos
TQT_SLOT( executed( TQListViewItem * ) ) );
connect( listview, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this,
TQT_SLOT( executed( TQListViewItem * ) ) );
- listview->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
+ listview->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
listview->setAcceptDrops( false );
listview->setFullWidth( true );
listview->setSelectionModeExt( KListView::Single );
@@ -246,7 +246,7 @@ TQWidget * KPluginSelectionWidget::insertKCM( TQWidget * parent,
{
//FIXME: not very verbose
TQLabel * label = new TQLabel( i18n( "Error" ), parent );
- label->setAlignment( Qt::AlignCenter );
+ label->tqsetAlignment( Qt::AlignCenter );
return label;
}
@@ -332,7 +332,7 @@ void KPluginSelectionWidget::updateConfigPage( KPluginInfo * plugininfo,
d->kps->configPage( 1 );
else
{
- if( !d->widgetIDs.contains( plugininfo->pluginName() ) )
+ if( !d->widgetIDs.tqcontains( plugininfo->pluginName() ) )
// if no widget exists for the plugin create it
embeddPluginKCMs( plugininfo, checked );
else
@@ -464,7 +464,7 @@ void KPluginSelectionWidget::save()
names->append( TQString::null );
for( TQStringList::ConstIterator nameit = names->begin();
nameit != names->end(); ++nameit )
- if( updatedModules.find( *nameit ) == updatedModules.end() )
+ if( updatedModules.tqfind( *nameit ) == updatedModules.end() )
updatedModules.append( *nameit );
}
for( TQStringList::ConstIterator it = updatedModules.begin(); it != updatedModules.end(); ++it )
@@ -523,7 +523,7 @@ KPluginSelector::KPluginSelector( TQWidget * parent, const char * name )
TQBoxLayout * hbox = new TQHBoxLayout( this, 0, KDialog::spacingHint() );
hbox->setAutoAdd( true );
- TQSplitter* splitter = new TQSplitter( TQSplitter::Horizontal, this );
+ TQSplitter* splitter = new TQSplitter( Qt::Horizontal, this );
d->frame = new TQFrame( splitter, "KPluginSelector left frame" );
d->frame->setFrameStyle( TQFrame::NoFrame );
( new TQVBoxLayout( d->frame, 0, KDialog::spacingHint() ) )->setAutoAdd( true );
@@ -536,7 +536,7 @@ KPluginSelector::KPluginSelector( TQWidget * parent, const char * name )
TQLabel * label = new TQLabel( i18n( "(This plugin is not configurable)" ),
d->widgetstack );
( new TQVBoxLayout( label, 0, KDialog::spacingHint() ) )->setAutoAdd( true );
- label->setAlignment( Qt::AlignCenter );
+ label->tqsetAlignment( Qt::AlignCenter );
label->setMinimumSize( 200, 200 );
d->widgetstack->addWidget( label, 1 );
@@ -696,7 +696,7 @@ void KPluginSelector::defaults()
// tabwidget - defaults() will be called for all of them)
TQWidget * pluginconfig = d->widgetstack->visibleWidget();
- KCModuleProxy * kcm = ( KCModuleProxy* )pluginconfig->qt_cast(
+ KCModuleProxy * kcm = ( KCModuleProxy* )pluginconfig->tqqt_cast(
"KCModuleProxy" );
if( kcm )
{
diff --git a/kutils/kpluginselector.h b/kutils/kpluginselector.h
index 0c2f1e55d..bf351d9e5 100644
--- a/kutils/kpluginselector.h
+++ b/kutils/kpluginselector.h
@@ -57,7 +57,7 @@ class KConfigGroup;
* @author Matthias Kretz <kretz@kde.org>
* @since 3.2
*/
-class KUTILS_EXPORT KPluginSelector : public QWidget
+class KUTILS_EXPORT KPluginSelector : public TQWidget
{
friend class KPluginSelectionWidget;
diff --git a/kutils/kpluginselector_p.h b/kutils/kpluginselector_p.h
index 1333b2dc4..b915aae71 100644
--- a/kutils/kpluginselector_p.h
+++ b/kutils/kpluginselector_p.h
@@ -39,7 +39,7 @@ class KCModuleInfo;
* @author Matthias Kretz <kretz@kde.org>
* @since 3.2
*/
-class KPluginSelectionWidget : public QWidget
+class KPluginSelectionWidget : public TQWidget
{
Q_OBJECT
public:
diff --git a/kutils/kreplace.cpp b/kutils/kreplace.cpp
index f825e93cc..3829f7988 100644
--- a/kutils/kreplace.cpp
+++ b/kutils/kreplace.cpp
@@ -50,7 +50,7 @@ KReplaceNextDialog::KReplaceNextDialog(TQWidget *parent) :
{
m_mainLabel = new TQLabel( this );
setMainWidget( m_mainLabel );
- resize(minimumSize());
+ resize(tqminimumSize());
}
void KReplaceNextDialog::setLabel( const TQString& pattern, const TQString& replacement )
@@ -90,7 +90,7 @@ KReplaceNextDialog* KReplace::dialog()
{
if ( !m_dialog )
{
- m_dialog = new KReplaceNextDialog( parentWidget() );
+ m_dialog = new KReplaceNextDialog( tqparentWidget() );
connect( m_dialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotReplaceAll() ) );
connect( m_dialog, TQT_SIGNAL( user2Clicked() ), this, TQT_SLOT( slotSkip() ) );
connect( m_dialog, TQT_SIGNAL( user3Clicked() ), this, TQT_SLOT( slotReplace() ) );
@@ -102,9 +102,9 @@ KReplaceNextDialog* KReplace::dialog()
void KReplace::displayFinalDialog() const
{
if ( !m_replacements )
- KMessageBox::information(parentWidget(), i18n("No text was replaced."));
+ KMessageBox::information(tqparentWidget(), i18n("No text was replaced."));
else
- KMessageBox::information(parentWidget(), i18n("1 replacement done.", "%n replacements done.", m_replacements ) );
+ KMessageBox::information(tqparentWidget(), i18n("1 replacement done.", "%n replacements done.", m_replacements ) );
}
KFind::Result KReplace::replace()
@@ -316,7 +316,7 @@ bool KReplace::shouldRestart( bool forceAsking, bool showNumMatches ) const
i18n("Do you want to restart search from the end?")
: i18n("Do you want to restart search at the beginning?");
- int ret = KMessageBox::questionYesNo( parentWidget(), message, TQString::null, i18n("Restart"), i18n("Stop") );
+ int ret = KMessageBox::questionYesNo( tqparentWidget(), message, TQString::null, i18n("Restart"), i18n("Stop") );
return( ret == KMessageBox::Yes );
}
diff --git a/kutils/kreplace.h b/kutils/kreplace.h
index ea385189b..d4e9792e2 100644
--- a/kutils/kreplace.h
+++ b/kutils/kreplace.h
@@ -238,7 +238,7 @@ signals:
*
* Extra care must be taken to properly implement the "no prompt-on-replace" case.
* For instance highlight isn't emitted in that case (some code might rely on it),
- * and for performance reasons one should repaint after replace() ONLY if
+ * and for performance reasons one should tqrepaint after replace() ONLY if
* prompt-on-replace was selected.
*
* @param text The text, in which the replacement has already been done.
diff --git a/kutils/kreplacedialog.cpp b/kutils/kreplacedialog.cpp
index 88c006b4d..d50bdaf03 100644
--- a/kutils/kreplacedialog.cpp
+++ b/kutils/kreplacedialog.cpp
@@ -32,7 +32,7 @@
/**
* we need to insert the strings after the dialog is set
- * up, otherwise TQComboBox will deliver an aweful big sizeHint
+ * up, otherwise TQComboBox will deliver an aweful big tqsizeHint
* for long replacement texts.
*/
class KReplaceDialog::KReplaceDialogPrivate {
diff --git a/kutils/ksettings/componentsdialog.cpp b/kutils/ksettings/componentsdialog.cpp
index cb3695e05..cdf18c934 100644
--- a/kutils/ksettings/componentsdialog.cpp
+++ b/kutils/ksettings/componentsdialog.cpp
@@ -59,9 +59,9 @@ ComponentsDialog::ComponentsDialog( TQWidget * parent, const char * name )
d->iconwidget = new TQLabel( d->infowidget );
( void )new KSeparator( d->infowidget );
d->commentwidget = new TQLabel( d->infowidget );
- d->commentwidget->setAlignment( Qt::WordBreak );
+ d->commentwidget->tqsetAlignment( TQt::WordBreak );
d->descriptionwidget = new TQLabel( d->infowidget );
- d->descriptionwidget->setAlignment( Qt::WordBreak );
+ d->descriptionwidget->tqsetAlignment( TQt::WordBreak );
d->listview->addColumn( TQString::null );
d->listview->header()->hide();
diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp
index 35ad153ef..aedfee9d4 100644
--- a/kutils/ksettings/dialog.cpp
+++ b/kutils/ksettings/dialog.cpp
@@ -108,7 +108,7 @@ class PageNode
if( **i < **j )
{
finished = false;
- qSwap( *i, *j );
+ tqSwap( *i, *j );
lastswapped = j;
}
--i;
@@ -225,7 +225,7 @@ class PageNode
TQVBox * page = dlg->addVBoxPage( m_value.group->name,
TQString::null, icon );
TQLabel * comment = new TQLabel( m_value.group->comment, page );
- comment->setTextFormat( Qt::RichText );
+ comment->setTextFormat( TQt::RichText );
m_value.group->page = page;
}
List::Iterator end = m_children.end();
@@ -484,12 +484,12 @@ bool Dialog::isPluginForKCMEnabled( KCModuleInfo * moduleinfo ) const
pcit != parentComponents.end(); ++pcit )
{
// if the parentComponent is not registered ignore it
- if( d->registeredComponents.find( *pcit ) ==
+ if( d->registeredComponents.tqfind( *pcit ) ==
d->registeredComponents.end() )
continue;
// we check if the parent component is a plugin
- if( ! d->plugininfomap.contains( *pcit ) )
+ if( ! d->plugininfomap.tqcontains( *pcit ) )
{
// if not the KCModule must be enabled
enabled = true;
diff --git a/kutils/ksettings/dialog.h b/kutils/ksettings/dialog.h
index c83caeeff..13f348287 100644
--- a/kutils/ksettings/dialog.h
+++ b/kutils/ksettings/dialog.h
@@ -70,7 +70,7 @@ namespace KSettings
* @author Matthias Kretz <kretz@kde.org>
* @since 3.2
*/
-class KUTILS_EXPORT Dialog : public QObject
+class KUTILS_EXPORT Dialog : public TQObject
{
friend class PageNode;
Q_OBJECT
diff --git a/kutils/ksettings/dispatcher.cpp b/kutils/ksettings/dispatcher.cpp
index 7f20c1bc3..b3a92f600 100644
--- a/kutils/ksettings/dispatcher.cpp
+++ b/kutils/ksettings/dispatcher.cpp
@@ -67,7 +67,7 @@ void Dispatcher::registerInstance( KInstance * instance, TQObject * recv, const
kdDebug( 701 ) << k_funcinfo << instanceName << endl;
m_instanceName[ recv ] = instanceName;
TQSignal * sig;
- if( m_instanceInfo.contains( instanceName ) )
+ if( m_instanceInfo.tqcontains( instanceName ) )
{
sig = m_instanceInfo[ instanceName ].signal;
}
@@ -86,7 +86,7 @@ void Dispatcher::registerInstance( KInstance * instance, TQObject * recv, const
KConfig * Dispatcher::configForInstanceName( const TQCString & instanceName )
{
kdDebug( 701 ) << k_funcinfo << endl;
- if( m_instanceInfo.contains( instanceName ) )
+ if( m_instanceInfo.tqcontains( instanceName ) )
{
KInstance * inst = m_instanceInfo[ instanceName ].instance;
if( inst )
@@ -111,7 +111,7 @@ void Dispatcher::reparseConfiguration( const TQCString & instanceName )
{
kdDebug( 701 ) << k_funcinfo << instanceName << endl;
// check if the instanceName is valid:
- if( ! m_instanceInfo.contains( instanceName ) )
+ if( ! m_instanceInfo.tqcontains( instanceName ) )
return;
// first we reparse the config of the instance so that the KConfig object
// will be up to date
diff --git a/kutils/ksettings/dispatcher.h b/kutils/ksettings/dispatcher.h
index 55e30412e..8bbe79fca 100644
--- a/kutils/ksettings/dispatcher.h
+++ b/kutils/ksettings/dispatcher.h
@@ -48,7 +48,7 @@ namespace KSettings
* @author Matthias Kretz <kretz@kde.org>
* @since 3.2
*/
-class KUTILS_EXPORT Dispatcher : public QObject
+class KUTILS_EXPORT Dispatcher : public TQObject
{
friend class KStaticDeleter<Dispatcher>;
diff --git a/kutils/tests/kfindtest.h b/kutils/tests/kfindtest.h
index b3be84a8b..847d9579c 100644
--- a/kutils/tests/kfindtest.h
+++ b/kutils/tests/kfindtest.h
@@ -25,7 +25,7 @@
class KFind;
-class KFindTest : public QObject
+class KFindTest : public TQObject
{
Q_OBJECT
diff --git a/kutils/tests/kreplacetest.cpp b/kutils/tests/kreplacetest.cpp
index a810b7706..0a33be94b 100644
--- a/kutils/tests/kreplacetest.cpp
+++ b/kutils/tests/kreplacetest.cpp
@@ -60,7 +60,7 @@ void KReplaceTest::replace( const TQString &pattern, const TQString &replacement
slotReplaceNext();
if ( m_needEventLoop )
- qApp->eventLoop()->enterLoop();
+ tqApp->eventLoop()->enterLoop();
}
void KReplaceTest::slotHighlight( const TQString &str, int matchingIndex, int matchedLength )
@@ -115,7 +115,7 @@ void KReplaceTest::slotReplaceNext()
}
#endif
if ( res == KFind::NoMatch && m_needEventLoop )
- qApp->eventLoop()->exitLoop();
+ tqApp->eventLoop()->exitLoop();
}
void KReplaceTest::print()
diff --git a/kutils/tests/kreplacetest.h b/kutils/tests/kreplacetest.h
index ff85ca34b..b8fb8120b 100644
--- a/kutils/tests/kreplacetest.h
+++ b/kutils/tests/kreplacetest.h
@@ -25,7 +25,7 @@
class KReplace;
-class KReplaceTest : public QObject
+class KReplaceTest : public TQObject
{
Q_OBJECT
public: