diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:24:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:24:21 -0600 |
| commit | 8ba97103df12b002f6b2cf1d24a4b389a6379f61 (patch) | |
| tree | 583bb7f0c8a54d0d497abec2f95a692cda8c7b30 /kommander/widgets | |
| parent | 0111fdc2a40580d418d365006c52845c320558b0 (diff) | |
| download | tdewebdev-8ba97103df12b002f6b2cf1d24a4b389a6379f61.tar.gz tdewebdev-8ba97103df12b002f6b2cf1d24a4b389a6379f61.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kommander/widgets')
| -rw-r--r-- | kommander/widgets/aboutdialog.cpp | 2 | ||||
| -rw-r--r-- | kommander/widgets/aboutdialog.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp index 097d0d22..4560f871 100644 --- a/kommander/widgets/aboutdialog.cpp +++ b/kommander/widgets/aboutdialog.cpp @@ -119,7 +119,7 @@ void AboutDialog::initialize(const TQString& appName, const TQString &icon, cons m_appName = appName; m_icon = icon; m_copyright = copyright; - m_aboutData = new KAboutData(m_appName, m_appName, m_version); + m_aboutData = new TDEAboutData(m_appName, m_appName, m_version); m_aboutData->setCopyrightStatement(m_copyright); if (!m_icon.isEmpty()) m_aboutData->setProgramLogo(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeMedium).convertToImage()); diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h index f7721103..079ef849 100644 --- a/kommander/widgets/aboutdialog.h +++ b/kommander/widgets/aboutdialog.h @@ -16,7 +16,7 @@ #include <kommanderwidget.h> class KAboutApplication; -class KAboutData; +class TDEAboutData; /** @author Andras Mantia <amantia@tdewebdev.org> @@ -55,7 +55,7 @@ private: void setBugAddress(const TQString &bugAddress); void setLicense(const TQString &license); - KAboutData *m_aboutData; + TDEAboutData *m_aboutData; TQString m_version; TQString m_appName; TQString m_copyright; |