summaryrefslogtreecommitdiffstats
path: root/kcontrol/kded
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kcontrol/kded
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/kded')
-rw-r--r--kcontrol/kded/kcmkded.cpp18
-rw-r--r--kcontrol/kded/kcmkded.h2
2 files changed, 10 insertions, 10 deletions
diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index f24af2c1e..2a7a7cbfb 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -96,7 +96,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
_lvStartup->setAllColumnsShowFocus(true);
_lvStartup->header()->setStretchEnabled(true, 2);
- KButtonBox *buttonBox = new KButtonBox( gb, Horizontal);
+ KButtonBox *buttonBox = new KButtonBox( gb, Qt::Horizontal);
_pbStart = buttonBox->addButton( i18n("Start"));
_pbStop = buttonBox->addButton( i18n("Stop"));
@@ -113,10 +113,10 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
void setModuleGroup(KConfig *config, const TQString &filename)
{
TQString module = filename;
- int i = module.findRev('/');
+ int i = module.tqfindRev('/');
if (i != -1)
module = module.mid(i+1);
- i = module.findRev('.');
+ i = module.tqfindRev('.');
if (i != -1)
module = module.left(i);
@@ -149,7 +149,7 @@ void KDEDConfig::load( bool useDefaults ) {
TQStringList files;
KGlobal::dirs()->findAllResources( "services",
- TQString::fromLatin1( "kded/*.desktop" ),
+ TQString::tqfromLatin1( "kded/*.desktop" ),
true, true, files );
TQListViewItem* item = 0L;
@@ -187,7 +187,7 @@ void KDEDConfig::save() {
TQStringList files;
KGlobal::dirs()->findAllResources( "services",
- TQString::fromLatin1( "kded/*.desktop" ),
+ TQString::tqfromLatin1( "kded/*.desktop" ),
true, true, files );
KConfig kdedrc("kdedrc", false, false);
@@ -201,7 +201,7 @@ void KDEDConfig::save() {
if (file.readBoolEntry("X-KDE-Kded-autoload")){
- item = static_cast<TQCheckListItem *>(_lvStartup->findItem(file.readEntry("X-KDE-Library"),4));
+ item = static_cast<TQCheckListItem *>(_lvStartup->tqfindItem(file.readEntry("X-KDE-Library"),4));
if (item) {
// we found a match, now compare and see what changed
setAutoloadEnabled(&kdedrc, *it, item->isOn());
@@ -251,13 +251,13 @@ void KDEDConfig::getServiceStatus()
it.current()->setText(3, NOT_RUNNING);
for ( QCStringList::Iterator it = modules.begin(); it != modules.end(); ++it )
{
- TQListViewItem *item = _lvLoD->findItem(*it, 4);
+ TQListViewItem *item = _lvLoD->tqfindItem(*it, 4);
if ( item )
{
item->setText(2, RUNNING);
}
- item = _lvStartup->findItem(*it, 4);
+ item = _lvStartup->tqfindItem(*it, 4);
if ( item )
{
item->setText(3, RUNNING);
@@ -269,7 +269,7 @@ void KDEDConfig::slotReload()
{
TQString current = _lvStartup->currentItem()->text(4);
load();
- TQListViewItem *item = _lvStartup->findItem(current, 4);
+ TQListViewItem *item = _lvStartup->tqfindItem(current, 4);
if (item)
_lvStartup->setCurrentItem(item);
}
diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h
index 8e6ff8d9a..1e9e42e72 100644
--- a/kcontrol/kded/kcmkded.h
+++ b/kcontrol/kded/kcmkded.h
@@ -62,7 +62,7 @@ private:
TQString NOT_RUNNING;
};
-class CheckListItem : public TQObject, public QCheckListItem
+class CheckListItem : public TQObject, public TQCheckListItem
{
Q_OBJECT
public: