diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /kinit/autostart.cpp | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kinit/autostart.cpp')
| -rw-r--r-- | kinit/autostart.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp index c7feb1752..4e8b6c784 100644 --- a/kinit/autostart.cpp +++ b/kinit/autostart.cpp @@ -49,14 +49,14 @@ AutoStart::AutoStart( bool new_startup ) { m_startList = new AutoStartList; m_startList->setAutoDelete(true); - KGlobal::dirs()->addResourceType("autostart", "share/autostart"); + TDEGlobal::dirs()->addResourceType("autostart", "share/autostart"); TQString xdgdirs = getenv("XDG_CONFIG_DIRS"); if (xdgdirs.isEmpty()) xdgdirs = "/etc/xdg"; TQStringList xdgdirslist = TQStringList::split( ':', xdgdirs ); for ( TQStringList::Iterator itr = xdgdirslist.begin(); itr != xdgdirslist.end(); ++itr ) { - KGlobal::dirs()->addResourceDir("autostart", (*itr) +"/autostart"); + TDEGlobal::dirs()->addResourceDir("autostart", (*itr) +"/autostart"); } } @@ -114,8 +114,8 @@ static bool startCondition(const TQString &condition) void AutoStart::loadAutoStartList() { - TQStringList files = KGlobal::dirs()->findAllResources("xdgconf-autostart", "*.desktop", false, true); - TQStringList kdefiles = KGlobal::dirs()->findAllResources("autostart", "*.desktop", false, true); + TQStringList files = TDEGlobal::dirs()->findAllResources("xdgconf-autostart", "*.desktop", false, true); + TQStringList kdefiles = TDEGlobal::dirs()->findAllResources("autostart", "*.desktop", false, true); files += kdefiles; for(TQStringList::ConstIterator it = files.begin(); @@ -143,7 +143,7 @@ AutoStart::loadAutoStartList() localit != files.end(); ++localit) { - if (((*localit).startsWith(KGlobal::dirs()->localxdgconfdir()) == true) || ((*localit).startsWith(KGlobal::dirs()->localtdedir()) == true)) { + if (((*localit).startsWith(TDEGlobal::dirs()->localxdgconfdir()) == true) || ((*localit).startsWith(TDEGlobal::dirs()->localtdedir()) == true)) { // Same local file name? TQString localOuter; TQString localInner; |