diff options
Diffstat (limited to 'kcontrol/background')
-rw-r--r-- | kcontrol/background/KCrossBGRender.cpp | 2 | ||||
-rw-r--r-- | kcontrol/background/bgadvanced.cpp | 26 | ||||
-rw-r--r-- | kcontrol/background/bgdialog.cpp | 84 | ||||
-rw-r--r-- | kcontrol/background/bgmonitor.cpp | 4 | ||||
-rw-r--r-- | kcontrol/background/bgrender.cpp | 14 | ||||
-rw-r--r-- | kcontrol/background/bgsettings.cpp | 14 | ||||
-rw-r--r-- | kcontrol/background/bgsettings.h | 6 | ||||
-rw-r--r-- | kcontrol/background/bgwallpaper.cpp | 12 | ||||
-rw-r--r-- | kcontrol/background/main.cpp | 4 |
9 files changed, 83 insertions, 83 deletions
diff --git a/kcontrol/background/KCrossBGRender.cpp b/kcontrol/background/KCrossBGRender.cpp index 489e98d1b..8f91a904d 100644 --- a/kcontrol/background/KCrossBGRender.cpp +++ b/kcontrol/background/KCrossBGRender.cpp @@ -149,7 +149,7 @@ bool KCrossBGRender::needWallpaperChange(){ } /* - * This method change the enabledEffect flag to TRUE of FALSE, according + * This method change the enabledEffect flag to true of false, according * with multiWallpaperMode and FileName (it needs to be a XML) */ void KCrossBGRender::fixEnabled(){ diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp index 3194c2859..2d5db7b8f 100644 --- a/kcontrol/background/bgadvanced.cpp +++ b/kcontrol/background/bgadvanced.cpp @@ -37,7 +37,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kpixmap.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include "bgrender.h" @@ -77,8 +77,8 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, dlg->m_listPrograms->header()->setStretchEnabled ( true, 1 ); dlg->m_listPrograms->setAllColumnsShowFocus(true); - connect(dlg->m_listPrograms, TQT_SIGNAL(clicked(TQListViewItem *)), - TQT_SLOT(slotProgramItemClicked(TQListViewItem *))); + connect(dlg->m_listPrograms, TQ_SIGNAL(clicked(TQListViewItem *)), + TQ_SLOT(slotProgramItemClicked(TQListViewItem *))); // Load programs TQStringList lst = KBackgroundProgram::list(); @@ -100,15 +100,15 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, dlg->m_spinCache->setSpecialValueText(i18n("Unlimited")); dlg->m_spinCache->setSuffix(i18n(" KB")); - connect(dlg->m_buttonAdd, TQT_SIGNAL(clicked()), - TQT_SLOT(slotAdd())); - connect(dlg->m_buttonRemove, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRemove())); - connect(dlg->m_buttonModify, TQT_SIGNAL(clicked()), - TQT_SLOT(slotModify())); + connect(dlg->m_buttonAdd, TQ_SIGNAL(clicked()), + TQ_SLOT(slotAdd())); + connect(dlg->m_buttonRemove, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRemove())); + connect(dlg->m_buttonModify, TQ_SIGNAL(clicked()), + TQ_SLOT(slotModify())); - connect(dlg->m_listPrograms, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - TQT_SLOT(slotProgramItemDoubleClicked(TQListViewItem *))); + connect(dlg->m_listPrograms, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + TQ_SLOT(slotProgramItemDoubleClicked(TQListViewItem *))); } else { @@ -119,8 +119,8 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, dlg->m_groupCache->hide(); } - connect( dlg->m_cbProgram, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotEnableProgram(bool))); + connect( dlg->m_cbProgram, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotEnableProgram(bool))); m_backgroundMode = m_oldBackgroundMode = r->backgroundMode(); if (m_oldBackgroundMode == KBackgroundSettings::Program) diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 66acb0fce..79686182e 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -47,7 +47,7 @@ #include <kimageio.h> #include <tdelocale.h> #include <kpixmap.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <kurlrequester.h> #include <twin.h> @@ -122,21 +122,21 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) m_eScreen = 0; } - connect(m_buttonIdentifyScreens, TQT_SIGNAL(clicked()), TQT_SLOT(slotIdentifyScreens())); + connect(m_buttonIdentifyScreens, TQ_SIGNAL(clicked()), TQ_SLOT(slotIdentifyScreens())); // preview monitor m_pMonitorArrangement = new BGMonitorArrangement(m_screenArrangement, "monitor arrangement"); - connect(m_pMonitorArrangement, TQT_SIGNAL(imageDropped(const TQString &)), TQT_SLOT(slotImageDropped(const TQString &))); + connect(m_pMonitorArrangement, TQ_SIGNAL(imageDropped(const TQString &)), TQ_SLOT(slotImageDropped(const TQString &))); if( m_multidesktop) { // desktop - connect(m_comboDesktop, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotSelectDesk(int))); + connect(m_comboDesktop, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotSelectDesk(int))); } if (m_numScreens > 1) { - connect(m_comboScreen, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotSelectScreen(int))); + connect(m_comboScreen, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotSelectScreen(int))); } // background image settings @@ -146,42 +146,42 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); TQToolTip::add(m_urlWallpaperButton, i18n("Open file dialog")); - connect(m_buttonGroupBackground, TQT_SIGNAL(clicked(int)), - TQT_SLOT(slotWallpaperTypeChanged(int))); - connect(m_urlWallpaperBox, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotWallpaper(int))); - connect(m_urlWallpaperButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotWallpaperSelection())); - connect(m_comboWallpaperPos, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotWallpaperPos(int))); - connect(m_buttonSetupWallpapers, TQT_SIGNAL(clicked()), - TQT_SLOT(slotSetupMulti())); + connect(m_buttonGroupBackground, TQ_SIGNAL(clicked(int)), + TQ_SLOT(slotWallpaperTypeChanged(int))); + connect(m_urlWallpaperBox, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotWallpaper(int))); + connect(m_urlWallpaperButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotWallpaperSelection())); + connect(m_comboWallpaperPos, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotWallpaperPos(int))); + connect(m_buttonSetupWallpapers, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSetupMulti())); // set up the background colour stuff - connect(m_colorPrimary, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(slotPrimaryColor(const TQColor &))); - connect(m_colorSecondary, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(slotSecondaryColor(const TQColor &))); - connect(m_comboPattern, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotPattern(int))); + connect(m_colorPrimary, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(slotPrimaryColor(const TQColor &))); + connect(m_colorSecondary, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(slotSecondaryColor(const TQColor &))); + connect(m_comboPattern, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotPattern(int))); // blend - connect(m_comboBlend, TQT_SIGNAL(activated(int)), TQT_SLOT(slotBlendMode(int))); - connect(m_sliderBlend, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotBlendBalance(int))); - connect(m_cbBlendReverse, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotBlendReverse(bool))); + connect(m_comboBlend, TQ_SIGNAL(activated(int)), TQ_SLOT(slotBlendMode(int))); + connect(m_sliderBlend, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotBlendBalance(int))); + connect(m_cbBlendReverse, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotBlendReverse(bool))); // Crossfading background - connect(m_cbCrossFadeBg, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotCrossFadeBg(bool))); + connect(m_cbCrossFadeBg, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotCrossFadeBg(bool))); // advanced options - connect(m_buttonAdvanced, TQT_SIGNAL(clicked()), - TQT_SLOT(slotAdvanced())); + connect(m_buttonAdvanced, TQ_SIGNAL(clicked()), + TQ_SLOT(slotAdvanced())); - connect(m_buttonGetNew, TQT_SIGNAL(clicked()), - TQT_SLOT(slotGetNewStuff())); + connect(m_buttonGetNew, TQ_SIGNAL(clicked()), + TQ_SLOT(slotGetNewStuff())); // renderers m_renderer.resize(m_numDesks+1); @@ -198,19 +198,19 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) // Setup the merged-screen renderer KBackgroundRenderer * r = new KBackgroundRenderer(eDesk, 0, false, _config); m_renderer[i].insert( 0, r ); - connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); + connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) ); // Setup the common-screen renderer r = new KBackgroundRenderer(eDesk, 0, true, _config); m_renderer[i].insert( 1, r ); - connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); + connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) ); // Setup the remaining renderers for each screen for (unsigned j=0; j < m_numScreens; ++j ) { r = new KBackgroundRenderer(eDesk, j, true, _config); m_renderer[i].insert( j+2, r ); - connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); + connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) ); } } } @@ -225,14 +225,14 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) // set up the common desktop renderer KBackgroundRenderer * r = new KBackgroundRenderer(0, 0, false, _config); m_renderer[0].insert(0, r); - connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int))); + connect(r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int))); // set up all the other desktop renderers for (unsigned i = 0; i < m_numDesks; ++i) { r = new KBackgroundRenderer(i, 0, false, _config); m_renderer[i+1].insert(0, r); - connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int))); + connect(r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int))); } } @@ -285,7 +285,7 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) updateUI(); #if (TQT_VERSION-0 >= 0x030200) - connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support + connect( tqApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support #endif } @@ -447,7 +447,7 @@ void BGDialog::slotIdentifyScreens() 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())); + TQTimer::singleShot(1500, screenLabel, TQ_SLOT(close())); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint()); @@ -536,7 +536,7 @@ void BGDialog::loadWallpaperFilesList() { TQStringList hiddenfiles; for (TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) { - KSimpleConfig fileConfig(*it); + TDESimpleConfig fileConfig(*it); fileConfig.setGroup("Wallpaper"); int slash = (*it).findRev('/') + 1; diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp index 1cf601bee..ac826a1ff 100644 --- a/kcontrol/background/bgmonitor.cpp +++ b/kcontrol/background/bgmonitor.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kpixmap.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurldrag.h> #include <tqapplication.h> #include <tqpixmap.h> @@ -47,7 +47,7 @@ BGMonitorArrangement::BGMonitorArrangement(TQWidget *parent, const char *name) BGMonitorLabel * label = new BGMonitorLabel(this); m_pBGMonitor[screen] = label; - connect( label->monitor(), TQT_SIGNAL(imageDropped(const TQString &)), this, TQT_SIGNAL(imageDropped(const TQString &)) ); + connect( label->monitor(), TQ_SIGNAL(imageDropped(const TQString &)), this, TQ_SIGNAL(imageDropped(const TQString &)) ); } parent->setFixedSize(200, 186); diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index ee67beb66..522065711 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -24,9 +24,9 @@ #include <dcopclient.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kimageeffect.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kpixmapio.h> #include <tdetempfile.h> #include <kcursor.h> @@ -63,7 +63,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou m_TilingEnabled = false; m_pTimer = new TQTimer(this); - connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(render())); + connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(render())); } @@ -239,8 +239,8 @@ int KBackgroundRenderer::doBackground(bool quit) delete m_pProc; m_pProc = new KShellProcess; *m_pProc << file; - connect(m_pProc, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(slotBackgroundDone(TDEProcess *))); + connect(m_pProc, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(slotBackgroundDone(TDEProcess *))); m_pProc->start(KShellProcess::NotifyOnExit); retval = Wait; break; @@ -402,7 +402,7 @@ wp_load: // HACK: Use KFileMetaInfo only when we're attached to DCOP. // KFileMetaInfo needs tdesycoca and so on, but this code is // used also in krootimage (which in turn is used by tdm). - if( kapp->dcopClient()->isAttached()) { + if( tdeApp->dcopClient()->isAttached()) { KFileMetaInfo metaInfo(file); if (metaInfo.isValid() && metaInfo.item("Orientation").isValid()) { switch (metaInfo.item("Orientation").string().toInt()) { @@ -1228,7 +1228,7 @@ void KVirtualBGRenderer::initRenderers() KCrossBGRender *r = new KCrossBGRender(m_desk, eScreen, m_bDrawBackgroundPerScreen, m_pConfig); m_renderer.insert( i, r ); r->setSize(renderSize(i)); - connect( r, TQT_SIGNAL(imageDone(int,int)), this, TQT_SLOT(screenDone(int,int)) ); + connect( r, TQ_SIGNAL(imageDone(int,int)), this, TQ_SLOT(screenDone(int,int)) ); } } diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index 278a250c9..2f41cb4c0 100644 --- a/kcontrol/background/bgsettings.cpp +++ b/kcontrol/background/bgsettings.cpp @@ -23,8 +23,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdeglobalsettings.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <krandomsequence.h> #include <konq_defaults.h> @@ -84,9 +84,9 @@ void KBackgroundPattern::init(bool force_rw) m_File = m_pDirs->findResource("dtop_pattern", m_Name + ".desktop"); if (force_rw || m_File.isEmpty()) { m_File = m_pDirs->saveLocation("dtop_pattern") + m_Name + ".desktop"; - m_pConfig = new KSimpleConfig(m_File); + m_pConfig = new TDESimpleConfig(m_File); } else - m_pConfig = new KSimpleConfig(m_File); + m_pConfig = new TDESimpleConfig(m_File); m_pConfig->setGroup("KDE Desktop Pattern"); @@ -251,10 +251,10 @@ void KBackgroundProgram::init(bool force_rw) m_File = m_pDirs->findResource("dtop_program", m_Name + ".desktop"); if (force_rw || m_File.isEmpty()) { m_File = m_pDirs->saveLocation("dtop_program") + m_Name + ".desktop"; - m_pConfig = new KSimpleConfig(m_File); + m_pConfig = new TDESimpleConfig(m_File); m_bReadOnly = false; } else { - m_pConfig = new KSimpleConfig(m_File); + m_pConfig = new TDESimpleConfig(m_File); m_bReadOnly = (m_File != locateLocal("dtop_program", m_Name + ".desktop")); } m_pConfig->setGroup("KDE Desktop Program"); @@ -1275,6 +1275,6 @@ void TDEGlobalBackgroundSettings::writeSettings() // tell kdesktop to get it's butt in gear and pick up the new settings TQByteArray data; - kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", data); + tdeApp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", data); } diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h index 348446c82..40b2c68d8 100644 --- a/kcontrol/background/bgsettings.h +++ b/kcontrol/background/bgsettings.h @@ -17,7 +17,7 @@ template <class TQString, class T> class TQMap; class TDEStandardDirs; -class KSimpleConfig; +class TDESimpleConfig; class TDEConfig; class TQString; class TQImage; @@ -66,7 +66,7 @@ private: TQString m_Name, m_Comment; TQString m_Pattern, m_File; TDEStandardDirs *m_pDirs; - KSimpleConfig *m_pConfig; + TDESimpleConfig *m_pConfig; }; @@ -137,7 +137,7 @@ private: TQString m_PreviewCommand, m_Comment; TQString m_Executable, m_File; TDEStandardDirs *m_pDirs; - KSimpleConfig *m_pConfig; + TDESimpleConfig *m_pConfig; }; diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp index b10c3707b..f75151247 100644 --- a/kcontrol/background/bgwallpaper.cpp +++ b/kcontrol/background/bgwallpaper.cpp @@ -30,7 +30,7 @@ #include <tdefiledialog.h> #include <kimageio.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurldrag.h> #include "bgsettings.h" @@ -114,11 +114,11 @@ BGMultiWallpaperDialog::BGMultiWallpaperDialog(KBackgroundSettings *settings, if (m_pSettings->multiWallpaperMode() == KBackgroundSettings::Random) dlg->m_cbRandom->setChecked(true); - connect(dlg->m_buttonAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); - connect(dlg->m_buttonRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); - connect(dlg->m_buttonMoveUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp())); - connect(dlg->m_buttonMoveDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown())); - connect(dlg->m_listImages, TQT_SIGNAL(clicked ( TQListBoxItem * )), TQT_SLOT(slotItemSelected( TQListBoxItem *))); + connect(dlg->m_buttonAdd, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd())); + connect(dlg->m_buttonRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove())); + connect(dlg->m_buttonMoveUp, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveUp())); + connect(dlg->m_buttonMoveDown, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveDown())); + connect(dlg->m_listImages, TQ_SIGNAL(clicked ( TQListBoxItem * )), TQ_SLOT(slotItemSelected( TQListBoxItem *))); dlg->m_buttonRemove->setEnabled( false ); dlg->m_buttonMoveUp->setEnabled( false ); dlg->m_buttonMoveDown->setEnabled( false ); diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp index 75ed22269..23478b5e1 100644 --- a/kcontrol/background/main.cpp +++ b/kcontrol/background/main.cpp @@ -65,7 +65,7 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList // reparenting that is done. setAcceptDrops(true); - connect(m_base, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(m_base, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmbackground"), I18N_NOOP("TDE Background Control Module"), @@ -100,7 +100,7 @@ void KBackground::save() m_base->save(); // reconfigure kdesktop. kdesktop will notify all clients - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isAttached()) client->attach(); |