summaryrefslogtreecommitdiffstats
path: root/akregator/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:08 -0600
commitd6d75dc9ff326e0bd6fc673adae71d53277fb8e4 (patch)
tree56a87e6a48bdf5e310958f1943a834e59eddbba1 /akregator/src
parent32b66c9ae78f439199a6d281cc33218e57c5106d (diff)
downloadtdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.tar.gz
tdepim-d6d75dc9ff326e0bd6fc673adae71d53277fb8e4.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'akregator/src')
-rw-r--r--akregator/src/akregator_view.cpp2
-rw-r--r--akregator/src/articlefilter.cpp4
-rw-r--r--akregator/src/librss/testlibrss.cpp2
-rw-r--r--akregator/src/nodelist.cpp2
-rw-r--r--akregator/src/speechclient.cpp2
-rw-r--r--akregator/src/tagnodelist.cpp2
-rw-r--r--akregator/src/trayicon.cpp4
7 files changed, 9 insertions, 9 deletions
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index ab0e430e2..7a14c2891 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -1143,7 +1143,7 @@ void View::slotRemoveTag(const Tag& tag)
*/
void View::slotNewTag()
{
- Tag tag(KApplication::randomString(8), "New Tag");
+ Tag tag(TDEApplication::randomString(8), "New Tag");
Kernel::self()->tagSet()->insert(tag);
TagNode* node = m_tagNodeList->findByTagID(tag.id());
if (node)
diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp
index a8bf8a365..080d61e7d 100644
--- a/akregator/src/articlefilter.cpp
+++ b/akregator/src/articlefilter.cpp
@@ -506,14 +506,14 @@ class ArticleFilter::ArticleFilterPrivate : public Shared
ArticleFilter::ArticleFilter() : d(new ArticleFilterPrivate)
{
- d->id = KApplication::random();
+ d->id = TDEApplication::random();
d->action = 0;
d->matcher = 0;
}
ArticleFilter::ArticleFilter(const AbstractMatcher& matcher, const AbstractAction& action) : d(new ArticleFilterPrivate)
{
- d->id = KApplication::random();
+ d->id = TDEApplication::random();
d->matcher = matcher.clone();
d->action = action.clone();
}
diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp
index f66a53d9b..721c11234 100644
--- a/akregator/src/librss/testlibrss.cpp
+++ b/akregator/src/librss/testlibrss.cpp
@@ -61,7 +61,7 @@ int main( int argc, char **argv )
KAboutData aboutData( "testlibrss", "testlibrss", "0.1" );
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app;
+ TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if ( args->count() != 1 ) args->usage();
diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp
index e79acb20d..4af5def2b 100644
--- a/akregator/src/nodelist.cpp
+++ b/akregator/src/nodelist.cpp
@@ -210,7 +210,7 @@ NodeList::~NodeList()
int NodeList::generateID()
{
- return KApplication::random();
+ return TDEApplication::random();
}
void NodeList::slotNodeAdded(TreeNode* node)
diff --git a/akregator/src/speechclient.cpp b/akregator/src/speechclient.cpp
index 8665213d9..6b96fe1e0 100644
--- a/akregator/src/speechclient.cpp
+++ b/akregator/src/speechclient.cpp
@@ -170,7 +170,7 @@ void SpeechClient::setupSpeechSystem()
else
{
TQString error;
- if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
+ if (TDEApplication::startServiceByDesktopName("kttsd", TQStringList(), &error))
{
kdDebug() << "Starting KTTSD failed with message " << error << endl;
d->isTextSpeechInstalled = false;
diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp
index 46acb9d1b..becd5b96b 100644
--- a/akregator/src/tagnodelist.cpp
+++ b/akregator/src/tagnodelist.cpp
@@ -90,7 +90,7 @@ TagNode* TagNodeList::findByTagID(const TQString& tagID)
bool TagNodeList::insert(TagNode* tagNode)
{
- tagNode->setId(KApplication::random());
+ tagNode->setId(TDEApplication::random());
TQString id = tagNode->tag().id();
if (!containsTagId(id))
{
diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index 67c3903fe..0ba92b09a 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -109,14 +109,14 @@ TQPixmap TrayIcon::takeScreenshot() const
const int WIDTH = 3;
int ax = g.x() - x - MARGINS -1;
int ay = g.y() - y - MARGINS -1;
- painter.setPen( TQPen(TQt::red/*KApplication::palette().active().highlight()*/, WIDTH) );
+ painter.setPen( TQPen(TQt::red/*TDEApplication::palette().active().highlight()*/, WIDTH) );
painter.drawArc(ax, ay, tw + 2*MARGINS, th + 2*MARGINS, 0, 16*360);
painter.end();
// Paint the border
const int BORDER = 1;
TQPixmap finalShot(w + 2*BORDER, h + 2*BORDER);
- finalShot.fill(KApplication::palette().active().foreground());
+ finalShot.fill(TDEApplication::palette().active().foreground());
painter.begin(&finalShot);
painter.drawPixmap(BORDER, BORDER, shot);
painter.end();