summaryrefslogtreecommitdiffstats
path: root/k3bsetup
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 19:51:35 -0600
committerTimothy Pearson <[email protected]>2013-01-22 19:51:35 -0600
commit267706e1270bedd77c0e36d8925ecba303d8725d (patch)
treeb7b5409e3c1eea4e95108d14d8a83620122f2260 /k3bsetup
parent9cc3e244ea10df42f7270494bd4662aa0f911378 (diff)
downloadk3b-267706e1270bedd77c0e36d8925ecba303d8725d.tar.gz
k3b-267706e1270bedd77c0e36d8925ecba303d8725d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'k3bsetup')
-rw-r--r--k3bsetup/k3bsetup2.cpp4
-rw-r--r--k3bsetup/k3bsetup2.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/k3bsetup/k3bsetup2.cpp b/k3bsetup/k3bsetup2.cpp
index 38583d2..9b9e78e 100644
--- a/k3bsetup/k3bsetup2.cpp
+++ b/k3bsetup/k3bsetup2.cpp
@@ -112,9 +112,9 @@ K3bSetup2::K3bSetup2( TQWidget *parent, const char *, const TQStringList& )
d = new Private();
d->config = new KConfig( "k3bsetup2rc" );
- m_aboutData = new KAboutData("k3bsetup2",
+ m_aboutData = new TDEAboutData("k3bsetup2",
"K3bSetup 2",
- 0, 0, KAboutData::License_GPL,
+ 0, 0, TDEAboutData::License_GPL,
"(C) 2003-2007 Sebastian Trueg");
m_aboutData->addAuthor("Sebastian Trueg", 0, "[email protected]");
diff --git a/k3bsetup/k3bsetup2.h b/k3bsetup/k3bsetup2.h
index e668521..9bd6b79 100644
--- a/k3bsetup/k3bsetup2.h
+++ b/k3bsetup/k3bsetup2.h
@@ -35,7 +35,7 @@ class K3bSetup2: public KCModule
~K3bSetup2();
TQString quickHelp() const;
- const KAboutData* aboutData() { return m_aboutData; };
+ const TDEAboutData* aboutData() { return m_aboutData; };
void load();
void save();
@@ -60,7 +60,7 @@ class K3bSetup2: public KCModule
base_K3bSetup2* w;
- KAboutData* m_aboutData;
+ TDEAboutData* m_aboutData;
};
#endif