summaryrefslogtreecommitdiffstats
path: root/kitchensync/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:15 -0600
commit5fc6f26e12b596addd235f87320c31761bd5a84d (patch)
tree0a1ff964c23fce07fc088017df4ad537d57e62e5 /kitchensync/src
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kitchensync/src')
-rw-r--r--kitchensync/src/main.cpp2
-rw-r--r--kitchensync/src/mainwidget.cpp6
-rw-r--r--kitchensync/src/mainwidget.h4
-rw-r--r--kitchensync/src/part.cpp2
-rw-r--r--kitchensync/src/part.h4
5 files changed, 9 insertions, 9 deletions
diff --git a/kitchensync/src/main.cpp b/kitchensync/src/main.cpp
index 95a25a8b6..c544326ff 100644
--- a/kitchensync/src/main.cpp
+++ b/kitchensync/src/main.cpp
@@ -34,7 +34,7 @@ static KCmdLineOptions options[] =
int main( int argc, char **argv )
{
- KAboutData *about = MainWidget::aboutData();
+ TDEAboutData *about = MainWidget::aboutData();
TDECmdLineArgs::init( argc, argv, about );
TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp
index 534de1c92..a277e1892 100644
--- a/kitchensync/src/mainwidget.cpp
+++ b/kitchensync/src/mainwidget.cpp
@@ -72,11 +72,11 @@ KXMLGUIClient *MainWidget::guiClient() const
return mGUIClient;
}
-KAboutData *MainWidget::aboutData()
+TDEAboutData *MainWidget::aboutData()
{
- KAboutData *about = new KAboutData( "kitchensync", I18N_NOOP( "KitchenSync" ),
+ TDEAboutData *about = new TDEAboutData( "kitchensync", I18N_NOOP( "KitchenSync" ),
"0.1", I18N_NOOP( "The TDE Syncing Application" ),
- KAboutData::License_GPL_V2,
+ TDEAboutData::License_GPL_V2,
I18N_NOOP( "(c) 2005, The KDE PIM Team" ) );
about->addAuthor( "Tobias Koenig", I18N_NOOP( "Current maintainer" ), "tokoe@kde.org" );
about->addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
diff --git a/kitchensync/src/mainwidget.h b/kitchensync/src/mainwidget.h
index 28df4f5de..0963aff4b 100644
--- a/kitchensync/src/mainwidget.h
+++ b/kitchensync/src/mainwidget.h
@@ -25,7 +25,7 @@
#include <tqwidget.h>
-class KAboutData;
+class TDEAboutData;
class KAction;
class KXMLGUIClient;
class GroupView;
@@ -45,7 +45,7 @@ class KDE_EXPORT MainWidget : public TQWidget
~MainWidget();
virtual KXMLGUIClient *guiClient() const;
- static KAboutData *aboutData();
+ static TDEAboutData *aboutData();
public slots:
void addGroup();
diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp
index f66eece63..b60e75f0c 100644
--- a/kitchensync/src/part.cpp
+++ b/kitchensync/src/part.cpp
@@ -58,7 +58,7 @@ KitchenSyncPart::~KitchenSyncPart()
closeURL();
}
-KAboutData *KitchenSyncPart::createAboutData()
+TDEAboutData *KitchenSyncPart::createAboutData()
{
return MainWidget::aboutData();
}
diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h
index ff9685c6a..7a716de1e 100644
--- a/kitchensync/src/part.h
+++ b/kitchensync/src/part.h
@@ -25,7 +25,7 @@
#include <kparts/factory.h>
#include <kparts/part.h>
-class KAboutData;
+class TDEAboutData;
class KitchenSyncPart: public KParts::ReadOnlyPart
{
@@ -37,7 +37,7 @@ class KitchenSyncPart: public KParts::ReadOnlyPart
TQObject *parent, const char *name, const TQStringList& );
virtual ~KitchenSyncPart();
- static KAboutData *createAboutData();
+ static TDEAboutData *createAboutData();
virtual void exit();
virtual bool openURL( const KURL &url );