summaryrefslogtreecommitdiffstats
path: root/kcontrol/background
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/background')
-rw-r--r--kcontrol/background/bgdialog.cpp10
-rw-r--r--kcontrol/background/bgdialog.h2
-rw-r--r--kcontrol/background/bgrender.cpp8
-rw-r--r--kcontrol/background/bgrender.h4
-rw-r--r--kcontrol/background/bgsettings.cpp54
-rw-r--r--kcontrol/background/bgsettings.h4
-rw-r--r--kcontrol/background/bgwallpaper.cpp2
7 files changed, 42 insertions, 42 deletions
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 53b095be1..2905d7ac7 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -69,8 +69,8 @@
BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
: BGDialog_UI(parent, "BGDialog")
{
- m_pGlobals = new KGlobalBackgroundSettings(_config);
- m_pDirs = KGlobal::dirs();
+ m_pGlobals = new TDEGlobalBackgroundSettings(_config);
+ m_pDirs = TDEGlobal::dirs();
m_multidesktop = _multidesktop;
m_previewUpdates = true;
@@ -246,7 +246,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
if (m_wallpaperPos == KBackgroundSettings::NoWallpaper)
m_wallpaperPos = KBackgroundSettings::Centred; // Default
- if (KGlobal::dirs()->isRestrictedResource("wallpaper"))
+ if (TDEGlobal::dirs()->isRestrictedResource("wallpaper"))
{
m_urlWallpaperButton->hide();
m_buttonSetupWallpapers->hide();
@@ -407,7 +407,7 @@ void BGDialog::slotIdentifyScreens()
{
TQLabel *screenLabel = new TQLabel(0,"Screen Identify", (WFlags)(WDestructiveClose | WStyle_Customize | WX11BypassWM));
- TQFont identifyFont(KGlobalSettings::generalFont());
+ TQFont identifyFont(TDEGlobalSettings::generalFont());
identifyFont.setPixelSize(100);
screenLabel->setFont(identifyFont);
@@ -1244,7 +1244,7 @@ void BGDialog::slotGetNewStuff()
//FIXME set this to a server when we get one
//should really be in a .rc file but could be either
//kcmshellrc or kcontrolrc
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("KNewStuff");
config->writeEntry( "ProvidersUrl", "http://download.kde.org/khotnewstuff/wallpaper-providers.xml" );
config->writeEntry( "StandardResource", "wallpaper" );
diff --git a/kcontrol/background/bgdialog.h b/kcontrol/background/bgdialog.h
index 30bb0f004..86e10a039 100644
--- a/kcontrol/background/bgdialog.h
+++ b/kcontrol/background/bgdialog.h
@@ -83,7 +83,7 @@ protected slots:
protected:
void getEScreen();
- KGlobalBackgroundSettings *m_pGlobals;
+ TDEGlobalBackgroundSettings *m_pGlobals;
KStandardDirs *m_pDirs;
bool m_multidesktop;
bool m_useViewports;
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index 51d114582..2c3da199f 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -53,7 +53,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou
m_State = 0;
m_isBusyCursor = false;
m_enableBusyCursor = false;
- m_pDirs = KGlobal::dirs();
+ m_pDirs = TDEGlobal::dirs();
m_rSize = m_Size = drawBackgroundPerScreen ? TDEApplication::desktop()->screenGeometry(screen).size() : TDEApplication::desktop()->geometry().size();
m_pProc = 0L;
m_Tempfile = 0L;
@@ -238,8 +238,8 @@ int KBackgroundRenderer::doBackground(bool quit)
delete m_pProc;
m_pProc = new KShellProcess;
*m_pProc << file;
- connect(m_pProc, TQT_SIGNAL(processExited(KProcess *)),
- TQT_SLOT(slotBackgroundDone(KProcess *)));
+ connect(m_pProc, TQT_SIGNAL(processExited(TDEProcess *)),
+ TQT_SLOT(slotBackgroundDone(TDEProcess *)));
m_pProc->start(KShellProcess::NotifyOnExit);
retval = Wait;
break;
@@ -741,7 +741,7 @@ void KBackgroundRenderer::blend(TQImage& dst, TQRect dr, const TQImage& src, TQP
-void KBackgroundRenderer::slotBackgroundDone(KProcess *process)
+void KBackgroundRenderer::slotBackgroundDone(TDEProcess *process)
{
Q_ASSERT(process == m_pProc);
m_State |= BackgroundDone;
diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h
index cf1682578..ee798894e 100644
--- a/kcontrol/background/bgrender.h
+++ b/kcontrol/background/bgrender.h
@@ -24,7 +24,7 @@ class TQString;
class TQTimer;
class KConfig;
-class KProcess;
+class TDEProcess;
class KTempFile;
class KShellProcess;
class KStandardDirs;
@@ -68,7 +68,7 @@ signals:
void programSuccess(int desk); //programSuccess is emitted after imageDone
private slots:
- void slotBackgroundDone(KProcess *);
+ void slotBackgroundDone(TDEProcess *);
void render();
void done();
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index b89731c42..d51995299 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -42,7 +42,7 @@ KBackgroundPattern::KBackgroundPattern(TQString name)
dirty = false;
hashdirty = true;
- m_pDirs = KGlobal::dirs();
+ m_pDirs = TDEGlobal::dirs();
m_pDirs->addResourceType("dtop_pattern", m_pDirs->kde_default("data") +
"kdesktop/patterns");
m_pConfig = 0L;
@@ -182,7 +182,7 @@ int KBackgroundPattern::hash()
/* static */
TQStringList KBackgroundPattern::list()
{
- KStandardDirs *dirs = KGlobal::dirs();
+ KStandardDirs *dirs = TDEGlobal::dirs();
dirs->addResourceType("dtop_pattern", dirs->kde_default("data") +
"kdesktop/patterns");
TQStringList lst = dirs->findAllResources("dtop_pattern", "*.desktop",
@@ -209,7 +209,7 @@ KBackgroundProgram::KBackgroundProgram(TQString name)
dirty = false;
hashdirty = true;
- m_pDirs = KGlobal::dirs();
+ m_pDirs = TDEGlobal::dirs();
m_pDirs->addResourceType("dtop_program", m_pDirs->kde_default("data") +
"kdesktop/programs");
m_pConfig = 0L;
@@ -393,7 +393,7 @@ int KBackgroundProgram::hash()
/* static */
TQStringList KBackgroundProgram::list()
{
- KStandardDirs *dirs = KGlobal::dirs();
+ KStandardDirs *dirs = TDEGlobal::dirs();
dirs->addResourceType("dtop_program", dirs->kde_default("data") +
"kdesktop/programs");
TQStringList lst = dirs->findAllResources("dtop_program", "*.desktop",
@@ -489,7 +489,7 @@ KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgrou
ADD_STRING(NoMultiRandom)
#undef ADD_STRING
- m_pDirs = KGlobal::dirs();
+ m_pDirs = TDEGlobal::dirs();
if (!config) {
int screen_number = 0;
@@ -651,7 +651,7 @@ void KBackgroundSettings::setWallpaperMode(int mode)
void KBackgroundSettings::setWallpaperList(TQStringList list)
{
- KStandardDirs *d = KGlobal::dirs();
+ KStandardDirs *d = TDEGlobal::dirs();
if (m_WallpaperList == list)
return;
@@ -1029,7 +1029,7 @@ TQString KBackgroundSettings::fingerprint()
s += TQString("wm:%1;").arg(m_WallpaperMode);
if (m_WallpaperMode != NoWallpaper)
{
- TQ_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
+ TQ_UINT32 rh = TDEGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
s += TQString("wp:%2:%1;").arg(rh).arg(currentWallpaper());
}
@@ -1063,9 +1063,9 @@ void KBackgroundSettings::setEnabled(const bool enable)
hashdirty = true;
}
-/**** KGlobalBackgroundSettings ****/
+/**** TDEGlobalBackgroundSettings ****/
-KGlobalBackgroundSettings::KGlobalBackgroundSettings(KConfig *_config)
+TDEGlobalBackgroundSettings::TDEGlobalBackgroundSettings(KConfig *_config)
{
m_pConfig = _config;
@@ -1073,14 +1073,14 @@ KGlobalBackgroundSettings::KGlobalBackgroundSettings(KConfig *_config)
}
-TQString KGlobalBackgroundSettings::deskName(int desk)
+TQString TDEGlobalBackgroundSettings::deskName(int desk)
{
return m_Names[desk];
}
/*
-void KGlobalBackgroundSettings::setDeskName(int desk, TQString name)
+void TDEGlobalBackgroundSettings::setDeskName(int desk, TQString name)
{
if (name == m_Names[desk])
return;
@@ -1090,7 +1090,7 @@ void KGlobalBackgroundSettings::setDeskName(int desk, TQString name)
*/
-void KGlobalBackgroundSettings::setCacheSize(int size)
+void TDEGlobalBackgroundSettings::setCacheSize(int size)
{
if (size == m_CacheSize)
return;
@@ -1099,7 +1099,7 @@ void KGlobalBackgroundSettings::setCacheSize(int size)
}
-void KGlobalBackgroundSettings::setLimitCache(bool limit)
+void TDEGlobalBackgroundSettings::setLimitCache(bool limit)
{
if (limit == m_bLimitCache)
return;
@@ -1108,7 +1108,7 @@ void KGlobalBackgroundSettings::setLimitCache(bool limit)
}
-bool KGlobalBackgroundSettings::drawBackgroundPerScreen(int desk) const
+bool TDEGlobalBackgroundSettings::drawBackgroundPerScreen(int desk) const
{
if ( desk > int(m_bDrawBackgroundPerScreen.size()) )
return _defDrawBackgroundPerScreen;
@@ -1116,7 +1116,7 @@ bool KGlobalBackgroundSettings::drawBackgroundPerScreen(int desk) const
}
-void KGlobalBackgroundSettings::setDrawBackgroundPerScreen(int desk, bool perScreen)
+void TDEGlobalBackgroundSettings::setDrawBackgroundPerScreen(int desk, bool perScreen)
{
if ( desk >= int(m_bDrawBackgroundPerScreen.size()) )
return;
@@ -1129,7 +1129,7 @@ void KGlobalBackgroundSettings::setDrawBackgroundPerScreen(int desk, bool perScr
}
-void KGlobalBackgroundSettings::setCommonScreenBackground(bool common)
+void TDEGlobalBackgroundSettings::setCommonScreenBackground(bool common)
{
if (common == m_bCommonScreen)
return;
@@ -1138,7 +1138,7 @@ void KGlobalBackgroundSettings::setCommonScreenBackground(bool common)
}
-void KGlobalBackgroundSettings::setCommonDeskBackground(bool common)
+void TDEGlobalBackgroundSettings::setCommonDeskBackground(bool common)
{
if (common == m_bCommonDesk)
return;
@@ -1147,7 +1147,7 @@ void KGlobalBackgroundSettings::setCommonDeskBackground(bool common)
}
-void KGlobalBackgroundSettings::setDockPanel(bool dock)
+void TDEGlobalBackgroundSettings::setDockPanel(bool dock)
{
if (dock == m_bDock)
return;
@@ -1156,7 +1156,7 @@ void KGlobalBackgroundSettings::setDockPanel(bool dock)
}
-void KGlobalBackgroundSettings::setExportBackground(bool _export)
+void TDEGlobalBackgroundSettings::setExportBackground(bool _export)
{
if (_export == m_bExport)
return;
@@ -1164,7 +1164,7 @@ void KGlobalBackgroundSettings::setExportBackground(bool _export)
m_bExport = _export;
}
-void KGlobalBackgroundSettings::setTextColor(TQColor _color)
+void TDEGlobalBackgroundSettings::setTextColor(TQColor _color)
{
if (_color == m_TextColor)
return;
@@ -1172,7 +1172,7 @@ void KGlobalBackgroundSettings::setTextColor(TQColor _color)
m_TextColor = _color;
}
-void KGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color)
+void TDEGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color)
{
if (_color == m_TextBackgroundColor)
return;
@@ -1180,7 +1180,7 @@ void KGlobalBackgroundSettings::setTextBackgroundColor(TQColor _color)
m_TextBackgroundColor = _color;
}
-void KGlobalBackgroundSettings::setShadowEnabled(bool enabled)
+void TDEGlobalBackgroundSettings::setShadowEnabled(bool enabled)
{
if (enabled == m_shadowEnabled)
return;
@@ -1188,7 +1188,7 @@ void KGlobalBackgroundSettings::setShadowEnabled(bool enabled)
m_shadowEnabled = enabled;
}
-void KGlobalBackgroundSettings::setTextLines(int lines)
+void TDEGlobalBackgroundSettings::setTextLines(int lines)
{
if (lines == m_textLines)
return;
@@ -1196,7 +1196,7 @@ void KGlobalBackgroundSettings::setTextLines(int lines)
m_textLines = lines;
}
-void KGlobalBackgroundSettings::setTextWidth(int width)
+void TDEGlobalBackgroundSettings::setTextWidth(int width)
{
if (width == m_textWidth)
return;
@@ -1204,7 +1204,7 @@ void KGlobalBackgroundSettings::setTextWidth(int width)
m_textWidth = width;
}
-void KGlobalBackgroundSettings::readSettings()
+void TDEGlobalBackgroundSettings::readSettings()
{
m_pConfig->setGroup("Background Common");
m_bCommonScreen = m_pConfig->readBoolEntry("CommonScreen", _defCommonScreen);
@@ -1220,7 +1220,7 @@ void KGlobalBackgroundSettings::readSettings()
for ( int i = 0 ; i < info.numberOfDesktops() ; ++i )
m_bDrawBackgroundPerScreen[i] = m_pConfig->readBoolEntry( TQString("DrawBackgroundPerScreen_%1").arg(i), _defDrawBackgroundPerScreen );
- m_TextColor = KGlobalSettings::textColor();
+ m_TextColor = TDEGlobalSettings::textColor();
m_pConfig->setGroup("FMSettings");
m_TextColor = m_pConfig->readColorEntry("NormalTextColor", &m_TextColor);
m_TextBackgroundColor = m_pConfig->readColorEntry("ItemTextBackground");
@@ -1234,7 +1234,7 @@ void KGlobalBackgroundSettings::readSettings()
dirty = false;
}
-void KGlobalBackgroundSettings::writeSettings()
+void TDEGlobalBackgroundSettings::writeSettings()
{
if (!dirty)
return;
diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h
index abb8b6cf9..03aa171e7 100644
--- a/kcontrol/background/bgsettings.h
+++ b/kcontrol/background/bgsettings.h
@@ -302,10 +302,10 @@ public:
/**
* A class to read/modify the global desktop background settings.
*/
-class KGlobalBackgroundSettings
+class TDEGlobalBackgroundSettings
{
public:
- KGlobalBackgroundSettings(KConfig *config);
+ TDEGlobalBackgroundSettings(KConfig *config);
TQString deskName(int desk);
//void setDeskName(int desk, TQString name);
diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp
index 82bb1d8af..f10add59a 100644
--- a/kcontrol/background/bgwallpaper.cpp
+++ b/kcontrol/background/bgwallpaper.cpp
@@ -149,7 +149,7 @@ void BGMultiWallpaperDialog::slotAdd()
mimeTypes += "image/svg+xml";
#endif
- KFileDialog fileDialog(KGlobal::dirs()->findDirs("wallpaper", "").first(),
+ KFileDialog fileDialog(TDEGlobal::dirs()->findDirs("wallpaper", "").first(),
mimeTypes.join( " " ), this,
0L, true);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-13 06:26:21 +0000