From 022de3b20c20fe70552113fb4db8106c796693a2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:52:03 -0600 Subject: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kbarcode/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kbarcode/main.cpp b/kbarcode/main.cpp index ec6014c..55ce62a 100644 --- a/kbarcode/main.cpp +++ b/kbarcode/main.cpp @@ -72,9 +72,9 @@ void setupDirs() int main(int argc, char *argv[]) { - KAboutData aboutData( "kbarcode", I18N_NOOP("KBarcode"), VERSION, I18N_NOOP( + TDEAboutData aboutData( "kbarcode", I18N_NOOP("KBarcode"), VERSION, I18N_NOOP( "KBarcode is a barcode and label printing application for KDE 3." - ), KAboutData::License_GPL, "KBarcode Build:\n" __DATE__ " " __TIME__ + ), TDEAboutData::License_GPL, "KBarcode Build:\n" __DATE__ " " __TIME__ , "(c) 2001-2006, Dominik Seichter\n\n", "http://www.kbarcode.net", "kbarcode-users@lists.sourceforge.net" );