summaryrefslogtreecommitdiffstats
path: root/kcontrol/konq/desktopbehavior_impl.cpp
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/konq/desktopbehavior_impl.cpp
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/konq/desktopbehavior_impl.cpp')
-rw-r--r--kcontrol/konq/desktopbehavior_impl.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index 6b4aaadb0..ab84300d4 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -60,7 +60,7 @@ void DesktopBehaviorModule::changed()
emit KCModule::changed( true );
}
-class DesktopBehaviorPreviewItem : public QCheckListItem
+class DesktopBehaviorPreviewItem : public TQCheckListItem
{
public:
DesktopBehaviorPreviewItem(DesktopBehavior *rootOpts, TQListView *parent,
@@ -90,7 +90,7 @@ private:
};
-class DesktopBehaviorMediaItem : public QCheckListItem
+class DesktopBehaviorMediaItem : public TQCheckListItem
{
public:
DesktopBehaviorMediaItem(DesktopBehavior *rootOpts, TQListView *parent,
@@ -124,7 +124,7 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char *
*/
bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded);
- m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media"));
+ m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media"));
connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed()));
connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
@@ -144,8 +144,8 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char *
if ( leftHandedMouse )
{
- qSwap(strMouseButton1, strMouseButton3);
- qSwap(strButtonTxt1, strButtonTxt3);
+ tqSwap(strMouseButton1, strMouseButton3);
+ tqSwap(strButtonTxt1, strButtonTxt3);
}
leftLabel->setText( strMouseButton1 );
@@ -259,7 +259,7 @@ void DesktopBehavior::fillMediaListView()
for (; it2 != mimetypes.end(); ++it2) {
if ( ((*it2)->name().startsWith("media/")) )
{
- bool ok=excludedMedia.contains((*it2)->name())==0;
+ bool ok=excludedMedia.tqcontains((*it2)->name())==0;
new DesktopBehaviorMediaItem (this, mediaListView, (*it2)->comment(), (*it2)->name(),ok);
}
}
@@ -309,8 +309,8 @@ void DesktopBehavior::load( bool useDefaults )
previewListView->clear();
TQStringList previews = g_pConfig->readListEntry("Preview");
for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
- new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.contains((*it)->desktopEntryName()));
- new DesktopBehaviorPreviewItem(this, previewListView, previews.contains("audio/"));
+ new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.tqcontains((*it)->desktopEntryName()));
+ new DesktopBehaviorPreviewItem(this, previewListView, previews.tqcontains("audio/"));
//
g_pConfig->setGroup( "FMSettings" );
toolTipBox->setChecked(g_pConfig->readBoolEntry( "ShowFileTips", true ) );