summaryrefslogtreecommitdiffstats
path: root/fileplugin
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:52:29 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:52:29 -0600
commit8cc395707c71d7969386b4e365ef827ce2492c74 (patch)
tree9daf8a17cafc4367f4f3b2a8bd19b268d01054f2 /fileplugin
parentc61c58c16694ef68be23922b39d1b6b40cda2b0c (diff)
downloadkbarcode-8cc395707c71d7969386b4e365ef827ce2492c74.zip
kbarcode-8cc395707c71d7969386b4e365ef827ce2492c74.tar.gz
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'fileplugin')
-rw-r--r--fileplugin/Makefile.am12
-rw-r--r--fileplugin/tdefile_kbarcode.cpp (renamed from fileplugin/kfile_kbarcode.cpp)6
-rw-r--r--fileplugin/tdefile_kbarcode.desktop (renamed from fileplugin/kfile_kbarcode.desktop)2
-rw-r--r--fileplugin/tdefile_kbarcode.h (renamed from fileplugin/kfile_kbarcode.h)2
4 files changed, 11 insertions, 11 deletions
diff --git a/fileplugin/Makefile.am b/fileplugin/Makefile.am
index da17f8d..12e5903 100644
--- a/fileplugin/Makefile.am
+++ b/fileplugin/Makefile.am
@@ -1,18 +1,18 @@
# set the include path for X, qt and KDE
INCLUDES = $(all_includes)
-kde_module_LTLIBRARIES = kfile_kbarcode.la
+kde_module_LTLIBRARIES = tdefile_kbarcode.la
-kfile_kbarcode_la_SOURCES = kfile_kbarcode.cpp
-kfile_kbarcode_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) $(all_libraries)
-kfile_kbarcode_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDECORE)
+tdefile_kbarcode_la_SOURCES = tdefile_kbarcode.cpp
+tdefile_kbarcode_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) $(all_libraries)
+tdefile_kbarcode_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDECORE)
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO
# messages: rc.cpp
-# $(XGETTEXT) *.cpp -o $(podir)/kfile_kbarcode.pot
+# $(XGETTEXT) *.cpp -o $(podir)/tdefile_kbarcode.pot
-services_DATA = kfile_kbarcode.desktop
+services_DATA = tdefile_kbarcode.desktop
servicesdir = $(kde_servicesdir)
diff --git a/fileplugin/kfile_kbarcode.cpp b/fileplugin/tdefile_kbarcode.cpp
index dbb9aac..4b1e253 100644
--- a/fileplugin/kfile_kbarcode.cpp
+++ b/fileplugin/tdefile_kbarcode.cpp
@@ -2,7 +2,7 @@
* Copyright (C) 2003 Dominik Seichter <domseichter@web.de>
*/
-#include "kfile_kbarcode.h"
+#include "tdefile_kbarcode.h"
#include <kgenericfactory.h>
#include <klocale.h>
@@ -10,7 +10,7 @@
#include <tqfile.h>
#include <tqdom.h>
-K_EXPORT_COMPONENT_FACTORY(kfile_kbarcode, KGenericFactory<KBarcodePlugin>( "kfile_kbarcode" ));
+K_EXPORT_COMPONENT_FACTORY(tdefile_kbarcode, KGenericFactory<KBarcodePlugin>( "tdefile_kbarcode" ));
KBarcodePlugin::KBarcodePlugin(TQObject *parent, const char *name,
const TQStringList &args)
@@ -81,4 +81,4 @@ bool KBarcodePlugin::readInfo( KFileMetaInfo& info, uint )
return true;
}
-#include "kfile_kbarcode.moc"
+#include "tdefile_kbarcode.moc"
diff --git a/fileplugin/kfile_kbarcode.desktop b/fileplugin/tdefile_kbarcode.desktop
index 4e43a28..5b3d77e 100644
--- a/fileplugin/kfile_kbarcode.desktop
+++ b/fileplugin/tdefile_kbarcode.desktop
@@ -5,5 +5,5 @@ Comment=KBarcode Info
Icon=kbarcode
ServiceTypes=KFilePlugin
MimeType=application/kbarcode-label
-X-TDE-Library=kfile_kbarcode
+X-TDE-Library=tdefile_kbarcode
SupportsThumbnail=
diff --git a/fileplugin/kfile_kbarcode.h b/fileplugin/tdefile_kbarcode.h
index 2ac3a4c..ae0a64d 100644
--- a/fileplugin/kfile_kbarcode.h
+++ b/fileplugin/tdefile_kbarcode.h
@@ -5,7 +5,7 @@
#ifndef _PLUGIN_KBARCODEFILEPLUGIN_H_
#define _PLUGIN_KBARCODEFILEPLUGIN_H_
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
class TQStringList;