summaryrefslogtreecommitdiffstats
path: root/kcontrol/background/bgdialog.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /kcontrol/background/bgdialog.cpp
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/background/bgdialog.cpp')
-rw-r--r--kcontrol/background/bgdialog.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 309d19d08..8294f53a3 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -142,7 +142,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
}
// background image settings
- TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("fileopen"));
+ TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen"));
TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
m_urlWallpaperButton->setIconSet( iconSet );
m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
@@ -257,7 +257,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
updateUI();
#if (QT_VERSION-0 >= 0x030200)
- connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
+ connect( qApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
#endif
}
@@ -395,7 +395,7 @@ TQString BGDialog::quickHelp() const
" wallpaper can be overlaid opaquely, or blended in different ways with"
" the background colors and patterns.<p>"
" KDE allows you to have the wallpaper change automatically at specified"
- " intervals of time. You can also tqreplace the background with a program"
+ " intervals of time. You can also replace the background with a program"
" that updates the desktop dynamically. For example, the \"kdeworld\""
" program shows a day/night map of the world which is updated periodically.");
}
@@ -414,14 +414,14 @@ void BGDialog::slotIdentifyScreens()
screenLabel->setFrameStyle(TQFrame::Panel);
screenLabel->setFrameShadow(TQFrame::Plain);
- screenLabel->tqsetAlignment(Qt::AlignCenter);
+ screenLabel->setAlignment(Qt::AlignCenter);
screenLabel->setNum(int(s + 1));
// BUGLET: we should not allow the identification to be entered again
// until the timer fires.
TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close()));
TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center());
- TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint());
+ TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint());
targetGeometry.moveCenter(screenCenter);
screenLabel->setGeometry(targetGeometry);
@@ -524,7 +524,7 @@ void BGDialog::loadWallpaperFilesList() {
if (imageCaption.isEmpty())
{
imageCaption = fileName;
- imageCaption.tqreplace('_', ' ');
+ imageCaption.replace('_', ' ');
imageCaption = KStringHandler::capwords(imageCaption);
}
@@ -571,7 +571,7 @@ void BGDialog::loadWallpaperFilesList() {
else
imageCaption = (*it).mid(slash);
- imageCaption.tqreplace('_', ' ');
+ imageCaption.replace('_', ' ');
imageCaption = KStringHandler::capwords(imageCaption);
}
@@ -943,7 +943,7 @@ void BGDialog::slotWallpaperTypeChanged(int i)
else
m_wallpaperPos = KBackgroundSettings::Tiled;
}
- else if (KMimeType::tqfindByPath(path)->is("image/svg+xml"))
+ else if (KMimeType::findByPath(path)->is("image/svg+xml"))
{
m_wallpaperPos = KBackgroundSettings::Scaled;
}
@@ -1004,7 +1004,7 @@ void BGDialog::slotSetupMulti()
{
KBackgroundRenderer *r = eRenderer();
- BGMultiWallpaperDialog dlg(r, tqtopLevelWidget());
+ BGMultiWallpaperDialog dlg(r, topLevelWidget());
if (dlg.exec() == TQDialog::Accepted) {
r->stop();
m_slideShowRandom = r->multiWallpaperMode();
@@ -1182,7 +1182,7 @@ void BGDialog::slotAdvanced()
KBackgroundRenderer *r = eRenderer();
m_previewUpdates = false;
- BGAdvancedDialog dlg(r, tqtopLevelWidget(), m_multidesktop);
+ BGAdvancedDialog dlg(r, topLevelWidget(), m_multidesktop);
if (!m_pMonitorArrangement->isEnabled()) {
dlg.makeReadOnly();