diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:51:01 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:51:01 -0600 |
commit | b9e542d0c805e9adee3a67e44532d5321032e21e (patch) | |
tree | e82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /src/profileengine | |
parent | 7a392a04059bd904dab4c78910a6d34aa0b37798 (diff) | |
download | tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/profileengine')
-rw-r--r-- | src/profileengine/editor/profileeditor.cpp | 2 | ||||
-rw-r--r-- | src/profileengine/lib/profile.cpp | 6 | ||||
-rw-r--r-- | src/profileengine/lib/profileengine.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp index 435e9986..78ed451d 100644 --- a/src/profileengine/editor/profileeditor.cpp +++ b/src/profileengine/editor/profileeditor.cpp @@ -73,7 +73,7 @@ public: { TQColorGroup cgNew = cg; if (m_derived) - cgNew.setColor(TQColorGroup::Text, KGlobalSettings::inactiveTextColor()); + cgNew.setColor(TQColorGroup::Text, TDEGlobalSettings::inactiveTextColor()); KListViewItem::paintCell(p, cgNew, column, width, alignment); } diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp index 68666f3a..4a75b387 100644 --- a/src/profileengine/lib/profile.cpp +++ b/src/profileengine/lib/profile.cpp @@ -165,7 +165,7 @@ bool Profile::hasInEntryList(EntryList &list, TQString value) bool Profile::remove() { - TQStringList dirs = KGlobal::dirs()->findDirs("data", "tdevelop/profiles" + dirName()); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdevelop/profiles" + dirName()); if ((dirs.count() == 1) && dirs[0].startsWith(TQDir::homeDirPath())) return KIO::NetAccess::del(KURL::fromPathOrURL(dirs[0]), 0); return false; @@ -180,7 +180,7 @@ void Profile::detachFromParent() KURL::List Profile::resources(const TQString &nameFilter) { TQStringList resources; - TQStringList resourceDirs = KGlobal::dirs()->resourceDirs("data"); + TQStringList resourceDirs = TDEGlobal::dirs()->resourceDirs("data"); for (TQStringList::const_iterator it = resourceDirs.begin(); it != resourceDirs.end(); ++it) { TQString dir = *it; @@ -200,6 +200,6 @@ KURL::List Profile::resources(const TQString &nameFilter) void Profile::addResource(const KURL &url) { - TQString saveLocation = KGlobal::dirs()->saveLocation("data", "tdevelop/profiles"+dirName(), true); + TQString saveLocation = TDEGlobal::dirs()->saveLocation("data", "tdevelop/profiles"+dirName(), true); KIO::NetAccess::file_copy(url, KURL::fromPathOrURL(saveLocation), -1, true); } diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp index 6664aba9..78df6789 100644 --- a/src/profileengine/lib/profileengine.cpp +++ b/src/profileengine/lib/profileengine.cpp @@ -29,7 +29,7 @@ ProfileEngine::ProfileEngine() { - TQStringList dirs = KGlobal::dirs()->findDirs("data", "tdevelop/profiles"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdevelop/profiles"); m_rootProfile = new Profile(0, "KDevelop"); |