summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 19:52:03 -0600
committerTimothy Pearson <[email protected]>2013-01-22 19:52:03 -0600
commit022de3b20c20fe70552113fb4db8106c796693a2 (patch)
tree5f854fd1e4a9278f4d1d3c0a83e3c3ca68c05670
parent260239cbfe71f9d6c831243774fe9d0df57b57ab (diff)
downloadkbarcode-022de3b20c20fe70552113fb4db8106c796693a2.tar.gz
kbarcode-022de3b20c20fe70552113fb4db8106c796693a2.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
-rw-r--r--kbarcode/main.cpp4
1 files 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", "[email protected]" );