diff options
Diffstat (limited to 'kcontrol/konq/desktopbehavior_impl.cpp')
| -rw-r--r-- | kcontrol/konq/desktopbehavior_impl.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index a48550628..6b4aaadb0 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -49,9 +49,9 @@ const int customMenu2ID = 6; DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, TQWidget *parent, const char * ) : KCModule( parent, "kcmkonq" ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout(this); + TQVBoxLayout* layout = new TQVBoxLayout(this); m_behavior = new DesktopBehavior(config, this); - tqlayout->addWidget(m_behavior); + layout->addWidget(m_behavior); connect(m_behavior, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); } @@ -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::tqfromLatin1("media")); + m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("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 ) { - tqSwap(strMouseButton1, strMouseButton3); - tqSwap(strButtonTxt1, strButtonTxt3); + qSwap(strMouseButton1, strMouseButton3); + qSwap(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.tqcontains((*it2)->name())==0; + bool ok=excludedMedia.contains((*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.tqcontains((*it)->desktopEntryName())); - new DesktopBehaviorPreviewItem(this, previewListView, previews.tqcontains("audio/")); + new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.contains((*it)->desktopEntryName())); + new DesktopBehaviorPreviewItem(this, previewListView, previews.contains("audio/")); // g_pConfig->setGroup( "FMSettings" ); toolTipBox->setChecked(g_pConfig->readBoolEntry( "ShowFileTips", true ) ); |