From 407c4ef989537371637ce2def7ef92bd5735d9e3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:52:33 -0600 Subject: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kdpkg-install/main.cpp | 4 ++-- kdpkg/main.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kdpkg-install/main.cpp b/kdpkg-install/main.cpp index 77e5f8d..ef5538f 100644 --- a/kdpkg-install/main.cpp +++ b/kdpkg-install/main.cpp @@ -38,11 +38,11 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { // specify data for About dialog - KAboutData* about = new KAboutData("kdpkg-install", I18N_NOOP("kdpkg-install"), ""); + TDEAboutData* about = new TDEAboutData("kdpkg-install", I18N_NOOP("kdpkg-install"), ""); about->setProgramLogo( TQImage("/usr/share/icons/hicolor/32x32/apps/kdpkg.png") ); about->setShortDescription( I18N_NOOP("Frontend for dpkg.") ); - about->setLicense(KAboutData::License_GPL_V2); + about->setLicense(TDEAboutData::License_GPL_V2); about->setHomepage("http://trinity.pearsoncomputing.net"); about->setBugAddress("http://bugs.pearsoncomputing.net"); about->setCopyrightStatement("(c) 2010 Timothy Pearson\n(c) 2007 Fabian Würtz"); diff --git a/kdpkg/main.cpp b/kdpkg/main.cpp index f1eb7f8..2b55b82 100644 --- a/kdpkg/main.cpp +++ b/kdpkg/main.cpp @@ -38,11 +38,11 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { // specify data for About dialog - KAboutData* about = new KAboutData("kdpkg", I18N_NOOP("kdpkg"), ""); + TDEAboutData* about = new TDEAboutData("kdpkg", I18N_NOOP("kdpkg"), ""); about->setProgramLogo( TQImage("/usr/share/icons/hicolor/32x32/apps/kdpkg.png") ); about->setShortDescription( I18N_NOOP("Frontend for dpkg.") ); - about->setLicense(KAboutData::License_GPL_V2); + about->setLicense(TDEAboutData::License_GPL_V2); about->setHomepage("http://trinity.pearsoncomputing.net"); about->setBugAddress("http://bugs.pearsoncomputing.net"); about->setCopyrightStatement("(c) 2010 Timothy Pearson\n(c) 2007 Fabian Würtz");