summaryrefslogtreecommitdiffstats
path: root/noatun-plugins/oblique
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:40:51 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:40:51 -0600
commit4c097708c4cc24f3b8e4c21f14644f5715767d47 (patch)
treee8ca4b1d3a3b3de0d18e5f144dcef9b36f830b84 /noatun-plugins/oblique
parent0642ee50634d90e255c6f45194f6a47dc1157cde (diff)
downloadtdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.tar.gz
tdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'noatun-plugins/oblique')
-rw-r--r--noatun-plugins/oblique/kdatacollection.cpp8
-rw-r--r--noatun-plugins/oblique/kdatacollection.h2
-rw-r--r--noatun-plugins/oblique/oblique.cpp2
-rw-r--r--noatun-plugins/oblique/tree.cpp2
-rw-r--r--noatun-plugins/oblique/view.cpp10
5 files changed, 12 insertions, 12 deletions
diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp
index aacb765..ec3485e 100644
--- a/noatun-plugins/oblique/kdatacollection.cpp
+++ b/noatun-plugins/oblique/kdatacollection.cpp
@@ -57,7 +57,7 @@ KDataCollection::KDataCollection(KConfig *config, const TQString &dir)
KDataCollection::KDataCollection(const TQString &dir)
{
- init(KGlobal::config(), "KDataCollection", dir, "appdata", dir);
+ init(TDEGlobal::config(), "KDataCollection", dir, "appdata", dir);
}
void KDataCollection::init(
@@ -78,7 +78,7 @@ TQStringList KDataCollection::names() const
// these are the entries I have
TQStringList n = g.readListEntry(mEntry);
- TQStringList fs = KGlobal::dirs()->findAllResources(mDatadir, mDir+"/*", false, true);
+ TQStringList fs = TDEGlobal::dirs()->findAllResources(mDatadir, mDir+"/*", false, true);
TQStringList total;
for (TQStringList::Iterator i(fs.begin()); i != fs.end(); ++i)
@@ -126,9 +126,9 @@ TQString KDataCollection::file(const TQString &name, bool create)
TQString KDataCollection::saveFile(const TQString &name, bool create)
{
- if (!KGlobal::dirs()->isRestrictedResource(mDatadir, mDir+"/"+name))
+ if (!TDEGlobal::dirs()->isRestrictedResource(mDatadir, mDir+"/"+name))
{
- TQString s = KGlobal::dirs()->saveLocation(mDatadir, mDir, create);
+ TQString s = TDEGlobal::dirs()->saveLocation(mDatadir, mDir, create);
if (s.length() && create)
{
diff --git a/noatun-plugins/oblique/kdatacollection.h b/noatun-plugins/oblique/kdatacollection.h
index 15cb98e..6230ddb 100644
--- a/noatun-plugins/oblique/kdatacollection.h
+++ b/noatun-plugins/oblique/kdatacollection.h
@@ -94,7 +94,7 @@ public:
KDataCollection(KConfig *config, const TQString &dir);
/**
- * constructor. the KConfig is assumed to be KGlobal::config()
+ * constructor. the KConfig is assumed to be TDEGlobal::config()
*
* otherwise the same as the previous function
**/
diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp
index 234833a..4b2b543 100644
--- a/noatun-plugins/oblique/oblique.cpp
+++ b/noatun-plugins/oblique/oblique.cpp
@@ -30,7 +30,7 @@ Oblique::Oblique()
mView = 0;
mAdder = 0;
- KConfigGroup g(KGlobal::config(), "oblique");
+ KConfigGroup g(TDEGlobal::config(), "oblique");
mBase = new Base(::locate("data", "noatun/")+"/oblique-list");
diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp
index 0087b99..b8909a1 100644
--- a/noatun-plugins/oblique/tree.cpp
+++ b/noatun-plugins/oblique/tree.cpp
@@ -478,7 +478,7 @@ Tree::Tree(Oblique *oblique, TQWidget *parent)
mSlice = oblique->base()->defaultSlice();
- KConfigGroup g(KGlobal::config(), "oblique");
+ KConfigGroup g(TDEGlobal::config(), "oblique");
mFileOfQuery = g.readEntry("schema", "standard");
if (!setSchema(mFileOfQuery))
{
diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index 073873c..15b15e5 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -89,10 +89,10 @@ View::View(Oblique *oblique)
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection());
- applyMainWindowSettings(KGlobal::config(), "Oblique View");
+ applyMainWindowSettings(TDEGlobal::config(), "Oblique View");
createGUI("obliqueui.rc");
- KConfigGroup g(KGlobal::config(), "oblique");
+ KConfigGroup g(TDEGlobal::config(), "oblique");
TQStringList tabids = g.readListEntry("tabids");
for (TQStringList::Iterator i(tabids.begin()); i != tabids.end(); ++i)
@@ -142,14 +142,14 @@ View::~View()
tabids.append(t);
}
- KConfigGroup g(KGlobal::config(), "oblique");
+ KConfigGroup g(TDEGlobal::config(), "oblique");
g.writeEntry("tabids", tabids);
g.sync();
}
void View::configureToolBars()
{
- saveMainWindowSettings(KGlobal::config(), "Oblique View");
+ saveMainWindowSettings(TDEGlobal::config(), "Oblique View");
KEditToolbar dlg(actionCollection(), "obliqueui.rc");
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig()));
dlg.exec();
@@ -158,7 +158,7 @@ void View::configureToolBars()
void View::newToolBarConfig()
{
createGUI("obliqueui.rc");
- applyMainWindowSettings(KGlobal::config(), "Oblique View");
+ applyMainWindowSettings(TDEGlobal::config(), "Oblique View");
}
void View::closeEvent(TQCloseEvent*)