summaryrefslogtreecommitdiffstats
path: root/ksplashml
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /ksplashml
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'ksplashml')
-rw-r--r--ksplashml/kcmksplash/installer.cpp16
-rw-r--r--ksplashml/kcmksplash/main.cpp2
-rw-r--r--ksplashml/themeengine/default/themelegacy.cpp2
-rw-r--r--ksplashml/themeengine/redmond/themeredmond.cpp6
-rw-r--r--ksplashml/themeengine/standard/themestandard.cpp2
-rw-r--r--ksplashml/themeengine/standard/wndicon.cpp2
-rw-r--r--ksplashml/themeengine/standard/wndstatus.cpp2
-rw-r--r--ksplashml/themeengine/unified/themeunified.cpp2
8 files changed, 17 insertions, 17 deletions
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp
index 860844ff..a1fa7a03 100644
--- a/ksplashml/kcmksplash/installer.cpp
+++ b/ksplashml/kcmksplash/installer.cpp
@@ -68,7 +68,7 @@ void ThemeListBox::mouseMoveEvent(TQMouseEvent *e)
{
if (((e->state() & Qt::LeftButton) != 0) && !mDragFile.isEmpty())
{
- int delay = KGlobalSettings::dndEventDelay();
+ int delay = TDEGlobalSettings::dndEventDelay();
TQPoint newPos = e->globalPos();
if(newPos.x() > mOldPos.x()+delay || newPos.x() < mOldPos.x()-delay ||
newPos.y() > mOldPos.y()+delay || newPos.y() < mOldPos.y()-delay)
@@ -88,7 +88,7 @@ void ThemeListBox::mouseMoveEvent(TQMouseEvent *e)
SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aInit)
: TQWidget(aParent, aName), mGui(!aInit)
{
- KGlobal::dirs()->addResourceType("ksplashthemes", KStandardDirs::kde_default("data") + "ksplash/Themes");
+ TDEGlobal::dirs()->addResourceType("ksplashthemes", KStandardDirs::kde_default("data") + "ksplash/Themes");
if (!mGui)
return;
@@ -161,7 +161,7 @@ int SplashInstaller::addTheme(const TQString &path, const TQString &name)
// Copy theme package into themes directory
void SplashInstaller::addNewTheme(const KURL &srcURL)
{
- TQString dir = KGlobal::dirs()->saveLocation("ksplashthemes");
+ TQString dir = TDEGlobal::dirs()->saveLocation("ksplashthemes");
KURL url;
TQString filename = srcURL.fileName();
int i = filename.findRev('.');
@@ -222,7 +222,7 @@ void SplashInstaller::readThemesList()
mThemesList->clear();
// Read local themes
- TQStringList entryList = KGlobal::dirs()->resourceDirs("ksplashthemes");
+ TQStringList entryList = TDEGlobal::dirs()->resourceDirs("ksplashthemes");
//kdDebug() << "readThemesList: " << entryList << endl;
TQDir dir;
TQStringList subdirs;
@@ -468,15 +468,15 @@ void SplashInstaller::slotTest()
return;
if( themeName == "Simple" )
{
- KProcess proc;
+ TDEProcess proc;
proc << "ksplashsimple" << "--test";
- if (!proc.start(KProcess::Block))
+ if (!proc.start(TDEProcess::Block))
KMessageBox::error(this,i18n("Unable to start ksplashsimple."));
return;
}
- KProcess proc;
+ TDEProcess proc;
proc << "ksplash" << "--test" << "--theme" << themeName;
- if (!proc.start(KProcess::Block))
+ if (!proc.start(TDEProcess::Block))
KMessageBox::error(this,i18n("Unable to start ksplash."));
}
diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp
index 53c5d45f..7c062ea5 100644
--- a/ksplashml/kcmksplash/main.cpp
+++ b/ksplashml/kcmksplash/main.cpp
@@ -86,7 +86,7 @@ TQString KSplashThemeMgr::quickHelp() const
void KSplashThemeMgr::init()
{
- KGlobal::dirs()->addResourceType("ksplashthemes", KStandardDirs::kde_default("data") + "ksplash/Themes");
+ TDEGlobal::dirs()->addResourceType("ksplashthemes", KStandardDirs::kde_default("data") + "ksplash/Themes");
}
void KSplashThemeMgr::save()
diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index 77274da9..de8aac2b 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -187,7 +187,7 @@ void ThemeDefault::_initUi()
top_label->height() + bottom_label->height() );
const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
- // KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
+ // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
// kdDebug() << "ThemeDefault::_initUi" << rect << endl;
move( rect.x() + (rect.width() - size().width())/2,
diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp
index 5992d1e0..5e5bf103 100644
--- a/ksplashml/themeengine/redmond/themeredmond.cpp
+++ b/ksplashml/themeengine/redmond/themeredmond.cpp
@@ -87,7 +87,7 @@ ThemeRedmond::ThemeRedmond( TQWidget *parent, const char *name, const TQStringLi
void ThemeRedmond::_initUi()
{
const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
- //TQRect fullScreen = KGlobalSettings::desktopGeometry(0L);
+ //TQRect fullScreen = TDEGlobalSettings::desktopGeometry(0L);
mImage.resize( screen.width(), screen.height() );
@@ -197,7 +197,7 @@ void ThemeRedmond::_initUi()
int faceSource = fAdminOnly;
KConfig *tdmconfig = new KConfig("tdm/tdmrc", true);
tdmconfig->setGroup("X-*-Greeter");
- TQString userPicsDir = tdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/';
+ TQString userPicsDir = tdmconfig->readEntry( "FaceDir", TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/';
TQString fs = tdmconfig->readEntry( "FaceSource" );
if (fs == TQString::fromLatin1("UserOnly"))
faceSource = fUserOnly;
@@ -309,7 +309,7 @@ void ThemeRedmond::paintEvent( TQPaintEvent *pe )
void ThemeRedmond::_readSettings()
{
const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
- //TQRect fullScreen = KGlobalSettings::desktopGeometry(0L);
+ //TQRect fullScreen = TDEGlobalSettings::desktopGeometry(0L);
if( !mTheme )
return;
diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp
index b0ceff51..a7c41692 100644
--- a/ksplashml/themeengine/standard/themestandard.cpp
+++ b/ksplashml/themeengine/standard/themestandard.cpp
@@ -76,7 +76,7 @@ void ThemeStandard::_initUi()
}
const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
- // KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
+ // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
move( rect.x() + (rect.width() - size().width())/2,
rect.y() + (rect.height() - size().height())/2 );
diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp
index 13c8ea00..7d66bdb6 100644
--- a/ksplashml/themeengine/standard/wndicon.cpp
+++ b/ksplashml/themeengine/standard/wndicon.cpp
@@ -99,7 +99,7 @@ TQPoint WndIcon::determinePosition()
bottomshift = topshift = 0;
const TQRect srect = kapp->desktop()->screenGeometry( mXineramaScreen );
- // KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
+ // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
DW = srect.width();
DH = srect.height();
SBH = mStatusHeight;
diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp
index 691017e7..07466c56 100644
--- a/ksplashml/themeengine/standard/wndstatus.cpp
+++ b/ksplashml/themeengine/standard/wndstatus.cpp
@@ -47,7 +47,7 @@ WndStatus::WndStatus( TQPalette /*pal*/,
setSpacing( 5 );
const TQRect rect = kapp->desktop()->screenGeometry( xineramaScreen );
- // KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
+ // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
TQLabel *pix = new TQLabel( this );
TQPixmap _icon( SmallIcon(icon.isNull()||icon.isEmpty()?TQString("run"):icon) );
diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp
index 782753c8..1e86054f 100644
--- a/ksplashml/themeengine/unified/themeunified.cpp
+++ b/ksplashml/themeengine/unified/themeunified.cpp
@@ -81,7 +81,7 @@ void ThemeUnified::_initUi()
// Center the dialog
TQSize sh = sizeHint();
- TQRect rect1 = KGlobalSettings::desktopGeometry(TQCursor::pos());
+ TQRect rect1 = TDEGlobalSettings::desktopGeometry(TQCursor::pos());
move(rect1.x() + (rect1.width() - sh.width())/2, rect1.y() + (rect1.height() - sh.height())/2);
}