summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-09-27 11:42:19 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-09-27 11:42:19 -0500
commit9526b0bc2eab8b1ffe5cdd48bda83df633325a4b (patch)
treee72de2ce9d5cc721771b23df9fc33c7565931d1d
parent36230c0b5d872388449b20d46d39a9e66a017714 (diff)
downloadtdeutils-9526b0bc2eab8b1ffe5cdd48bda83df633325a4b.tar.gz
tdeutils-9526b0bc2eab8b1ffe5cdd48bda83df633325a4b.zip
Update superkaramba for recent TDEHotNewStuff changes
-rw-r--r--superkaramba/src/sknewstuff.cpp2
-rw-r--r--superkaramba/src/sknewstuff.h6
-rw-r--r--superkaramba/src/themesdlg.cpp30
3 files changed, 19 insertions, 19 deletions
diff --git a/superkaramba/src/sknewstuff.cpp b/superkaramba/src/sknewstuff.cpp
index e5a413b..bc8f7d4 100644
--- a/superkaramba/src/sknewstuff.cpp
+++ b/superkaramba/src/sknewstuff.cpp
@@ -40,7 +40,7 @@
#include "sknewstuff.h"
SKNewStuff::SKNewStuff( ThemesDlg *dlg ) :
- KNewStuff( "superkaramba/themes", dlg ),
+ TDENewStuff( "superkaramba/themes", dlg ),
mDlg( dlg )
{
}
diff --git a/superkaramba/src/sknewstuff.h b/superkaramba/src/sknewstuff.h
index 9c10d2b..0e34dda 100644
--- a/superkaramba/src/sknewstuff.h
+++ b/superkaramba/src/sknewstuff.h
@@ -29,13 +29,13 @@
#endif
#ifdef HAVE_KNEWSTUFF
-#include "knewstuff/knewstuff.h"
-#include "knewstuff/entry.h"
+#include "tdenewstuff/knewstuff.h"
+#include "tdenewstuff/entry.h"
class ThemesDlg;
class KArchiveDirectory;
-class SKNewStuff : public KNewStuff
+class SKNewStuff : public TDENewStuff
{
public:
SKNewStuff( ThemesDlg * );
diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp
index 055cbdf..b1bd91c 100644
--- a/superkaramba/src/themesdlg.cpp
+++ b/superkaramba/src/themesdlg.cpp
@@ -218,12 +218,12 @@ void ThemesDlg::getNewStuff()
{
#ifdef HAVE_KNEWSTUFF
TDEConfig* config = TDEGlobal::config();
- config->setGroup("KNewStuff");
+ config->setGroup("TDENewStuff");
config->writePathEntry("ProvidersUrl",
- TQString::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml"));
+ TQString::fromLatin1("https://www.trinitydesktop.org/ocs/karamba-providers.xml"));
config->sync();
- m_newStuffStatus = config->entryMap("KNewStuffStatus").keys();
- //This check is b/c KNewStuff will download, throw an error,
+ m_newStuffStatus = config->entryMap("TDENewStuffStatus").keys();
+ //This check is b/c KNewStuff will download, throw an error,
//and still have the entry in the config that it was successful
configSanityCheck();
@@ -302,7 +302,7 @@ void ThemesDlg::writeNewStuffConfig(const TQString &file)
{
#ifdef HAVE_KNEWSTUFF
TDEConfig* config = TDEGlobal::config();
- TQStringList keys = config->entryMap("KNewStuffStatus").keys();
+ TQStringList keys = config->entryMap("TDENewStuffStatus").keys();
for(TQStringList::Iterator it = m_newStuffStatus.begin();
it != m_newStuffStatus.end(); ++it)
@@ -311,7 +311,7 @@ void ThemesDlg::writeNewStuffConfig(const TQString &file)
}
if(!keys.isEmpty())
{
- config->setGroup("KNewStuffNames");
+ config->setGroup("TDENewStuffNames");
config->writeEntry(file, keys[0]);
config->sync();
}
@@ -322,8 +322,8 @@ void ThemesDlg::configSanityCheck()
{
#ifdef HAVE_KNEWSTUFF
TDEConfig* config = TDEGlobal::config();
- TQStringList statusKeys = config->entryMap("KNewStuffStatus").keys();
- TQStringList nameKeys = config->entryMap("KNewStuffNames").keys();
+ TQStringList statusKeys = config->entryMap("TDENewStuffStatus").keys();
+ TQStringList nameKeys = config->entryMap("TDENewStuffNames").keys();
TQStringList removeList;
for(TQStringList::Iterator it = statusKeys.begin();
@@ -331,7 +331,7 @@ void ThemesDlg::configSanityCheck()
{
TQString keyName(*it);
bool removeKey = true;
- config->setGroup("KNewStuffNames");
+ config->setGroup("TDENewStuffNames");
for(TQStringList::Iterator it2 = nameKeys.begin();
it2 != nameKeys.end(); ++it2)
{
@@ -345,7 +345,7 @@ void ThemesDlg::configSanityCheck()
if( removeKey )
{
kdDebug() << "sanityCheck() deleting entry " << keyName << endl;
- config->setGroup("KNewStuffStatus");
+ config->setGroup("TDENewStuffStatus");
config->deleteEntry( keyName );
}
}
@@ -428,7 +428,7 @@ bool ThemesDlg::isDownloaded( const TQString& path )
{
kdDebug() << "isDownloaded path: " << path << endl;
TDEConfig* config = TDEGlobal::config();
- config->setGroup("KNewStuffNames");
+ config->setGroup("TDENewStuffNames");
return !config->readEntry(path).isEmpty();
}
@@ -479,14 +479,14 @@ void ThemesDlg::uninstall()
#ifdef HAVE_KNEWSTUFF
// Remove theme from KNewStuffStatus
TDEConfig* config = TDEGlobal::config();
- config->setGroup("KNewStuffNames");
+ config->setGroup("TDENewStuffNames");
TQString name = config->readEntry(tempPath);
if(!name.isEmpty())
{
kdDebug() << "removing " << tempPath << " under KNewStuffNames from superkarambarc"
<< endl;
kapp->config()->deleteEntry(tempPath);
- config->setGroup("KNewStuffStatus");
+ config->setGroup("TDENewStuffStatus");
kdDebug() << "removing " << name << " under KNewStuffStatus from superkarambarc"
<< endl;
kapp->config()->deleteEntry(name);
@@ -509,13 +509,13 @@ void ThemesDlg::uninstall()
#ifdef HAVE_KNEWSTUFF
// Remove theme from KNewStuffStatus
TDEConfig* config = TDEGlobal::config();
- config->setGroup("KNewStuffNames");
+ config->setGroup("TDENewStuffNames");
TQString name = config->readEntry(theme.path());
if(!name.isEmpty())
{
kdDebug() << "removing " << theme.path() << " from superkarambarc" << endl;
kapp->config()->deleteEntry(theme.path());
- config->setGroup("KNewStuffStatus");
+ config->setGroup("TDENewStuffStatus");
kdDebug() << "removing " << name << " from superkarambarc" << endl;
kapp->config()->deleteEntry(name);
kapp->config()->sync();