summaryrefslogtreecommitdiffstats
path: root/konq-plugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:14:45 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:14:45 -0600
commit8f06b9a8882be84f3d0e5b0f5e3b8e51515e723f (patch)
tree153d468e6403953c97f22688905f76cedbe05f27 /konq-plugins
parent4b5c71fdded4cfec525273c795bfb0b79bb8a5dd (diff)
downloadtdeaddons-8f06b9a8882be84f3d0e5b0f5e3b8e51515e723f.tar.gz
tdeaddons-8f06b9a8882be84f3d0e5b0f5e3b8e51515e723f.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins')
-rw-r--r--konq-plugins/fsview/fsview.cpp2
-rw-r--r--konq-plugins/fsview/fsview_part.cpp6
-rw-r--r--konq-plugins/fsview/main.cpp2
-rw-r--r--konq-plugins/searchbar/searchbar.cpp2
-rw-r--r--konq-plugins/sidebar/newsticker/sidebar_news.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp
index 931c43f..49cc4ff 100644
--- a/konq-plugins/fsview/fsview.cpp
+++ b/konq-plugins/fsview/fsview.cpp
@@ -428,7 +428,7 @@ void FSView::saveFSOptions()
void FSView::quit()
{
saveFSOptions();
- KApplication::kApplication()->quit();
+ TDEApplication::kApplication()->quit();
}
void FSView::doRedraw()
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index 3995a47..205d994 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -144,7 +144,7 @@ FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName,
TQObject::connect (_colorMenu->popupMenu(), TQT_SIGNAL (aboutToShow()),
TQT_SLOT (slotShowColorMenu()));
- slotSettingsChanged(KApplication::SETTINGS_MOUSE);
+ slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
if (kapp)
connect( kapp, TQT_SIGNAL( settingsChanged(int) ),
TQT_SLOT( slotSettingsChanged(int) ) );
@@ -178,7 +178,7 @@ FSViewPart::~FSViewPart()
void FSViewPart::slotSettingsChanged(int category)
{
- if (category != KApplication::SETTINGS_MOUSE) return;
+ if (category != TDEApplication::SETTINGS_MOUSE) return;
TQObject::disconnect(_view,TQT_SIGNAL(clicked(TreeMapItem*)),
_ext,TQT_SLOT(selected(TreeMapItem*)));
@@ -206,7 +206,7 @@ void FSViewPart::showInfo()
void FSViewPart::showHelp()
{
- KApplication::startServiceByDesktopName("khelpcenter",
+ TDEApplication::startServiceByDesktopName("khelpcenter",
TQString("help:/konq-plugins/fsview/index.html"));
}
diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp
index 151fe83..105f4c4 100644
--- a/konq-plugins/fsview/main.cpp
+++ b/konq-plugins/fsview/main.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* argv[])
I18N_NOOP("(c) 2002, Josef Weidendorfer"));
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
- KApplication a;
+ TDEApplication a;
KConfigGroup gconfig(KGlobal::config(), TQCString("General"));
TQString path = gconfig.readPathEntry("Path", ".");
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index c31de51..9460927 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -285,7 +285,7 @@ void SearchBarPlugin::startSearch(const TQString &_search)
KURIFilter::self()->filterURI( data, list );
}
- if(KApplication::keyboardMouseState() & TQt::ControlButton)
+ if(TDEApplication::keyboardMouseState() & TQt::ControlButton)
{
KParts::URLArgs args;
args.setNewTab(true);
diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
index cf560ac..de6788f 100644
--- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp
+++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
@@ -126,7 +126,7 @@ namespace KSB_News {
int err = 0;
if (! kapp->dcopClient()->isApplicationRegistered("rssservice"))
- if (KApplication::startServiceByDesktopName("rssservice", TQString(),
+ if (TDEApplication::startServiceByDesktopName("rssservice", TQString(),
&rdfservice_error) > 0)
err = 1;