summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-07 11:07:55 -0600
committerTimothy Pearson <[email protected]>2013-02-07 11:07:55 -0600
commite8cea6a38c3e756a47d8704d5b5916c3065b1c36 (patch)
tree16decd989ea3a981f97fa97ea68720d1a698bef1
parent78b4b738d3bd15c2c820bb566c4725f7cea1ff8d (diff)
downloadtdegraphics-e8cea6a38c3e756a47d8704d5b5916c3065b1c36.tar.gz
tdegraphics-e8cea6a38c3e756a47d8704d5b5916c3065b1c36.zip
Rename KAbout to avoid conflicts with KDE4
-rw-r--r--ksvg/plugin/ksvg_plugin.cpp4
-rw-r--r--kuickshow/ChangeLog2
-rw-r--r--kviewshell/kviewpart.cpp2
-rw-r--r--kviewshell/kviewpart.h4
4 files changed, 6 insertions, 6 deletions
diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp
index 1873dfcc..001d2b05 100644
--- a/ksvg/plugin/ksvg_plugin.cpp
+++ b/ksvg/plugin/ksvg_plugin.cpp
@@ -75,7 +75,7 @@ struct KSVGPlugin::Private
SVGDocumentImpl *doc;
KSVGCanvas *canvas;
TQPixmap *backgroundPixmap;
- KAboutApplication *aboutKSVG;
+ TDEAboutApplication *aboutKSVG;
unsigned int width;
unsigned int height;
@@ -144,7 +144,7 @@ KSVGPlugin::KSVGPlugin(TQWidget *wparent, const char *, TQObject *parent, const
ksvgd->renderingBackendAction->setItems(items);
ksvgd->renderingBackendAction->setCurrentItem(KSVG::CanvasFactory::self()->itemInList(ksvgd->canvas));
- ksvgd->aboutKSVG = new KAboutApplication(KSVGPluginFactory::instance()->aboutData(), wparent);
+ ksvgd->aboutKSVG = new TDEAboutApplication(KSVGPluginFactory::instance()->aboutData(), wparent);
setXMLFile("ksvgplugin.rc");
}
diff --git a/kuickshow/ChangeLog b/kuickshow/ChangeLog
index 4609a122..36d87c57 100644
--- a/kuickshow/ChangeLog
+++ b/kuickshow/ChangeLog
@@ -167,7 +167,7 @@ Thu Apr 19 23:16:12 2001 Carsten Pfeiffer <[email protected]>
Tue Mar 13 03:16:24 2001 Carsten Pfeiffer <[email protected]>
* added lots of translations from the translation team.
- I need to add a KAboutDialog somewhere to give them credit
+ I need to add a TDEAboutDialog somewhere to give them credit
for their excellent work!
Fri Mar 9 21:50:12 2001 Carsten Pfeiffer <[email protected]>
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp
index 69c3a4a3..9cfbfa80 100644
--- a/kviewshell/kviewpart.cpp
+++ b/kviewshell/kviewpart.cpp
@@ -1417,7 +1417,7 @@ void KViewPart::aboutKViewShell()
if (aboutDialog == 0)
{
// Create Dialog
- aboutDialog = new KAboutDialog(mainWidget, "about_kviewshell");
+ aboutDialog = new TDEAboutDialog(mainWidget, "about_kviewshell");
aboutDialog->setTitle(I18N_NOOP("KViewShell"));
aboutDialog->setVersion("0.6");
aboutDialog->setAuthor("Matthias Hoelzer-Kluepfel", TQString(), TQString(),
diff --git a/kviewshell/kviewpart.h b/kviewshell/kviewpart.h
index 4af55fc7..b378028b 100644
--- a/kviewshell/kviewpart.h
+++ b/kviewshell/kviewpart.h
@@ -10,7 +10,7 @@
#include <tqtimer.h>
class TDEAboutData;
-class KAboutDialog;
+class TDEAboutDialog;
class TDEAccel;
class TDEAction;
class TDEConfig;
@@ -233,7 +233,7 @@ private:
TQTimer fitTimer;
- KAboutDialog* aboutDialog;
+ TDEAboutDialog* aboutDialog;
};