Rename many classes and header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 23fba05091
commit 0390e45028

@ -35,7 +35,7 @@ noinst_HEADERS = barcodecombo.h barcodedialog.h barcodedialogs.h \
propertywidget.h tec.h barcodeprinterdlg.h textlineitem.h textlineedit.h tokendialog.h \
barkode.h gnubarcode.h barkodeengine.h pixmapbarcode.h batchwizard.h csvfile.h \
referencecounted.h dstextedit.h encodingcombo.h purepostscript.h tbarcode2.h \
kactionmap.h
tdeactionmap.h
kbarcode_SOURCES = barcodecombo.cpp barcodedialog.cpp \
barcodedialogs.cpp commands.cpp configdialog.cpp confwizard.cpp csvimportdlg.cpp \
@ -50,7 +50,7 @@ kbarcode_SOURCES = barcodecombo.cpp barcodedialog.cpp \
propertywidget.cpp tec.cpp barcodeprinterdlg.cpp textlineitem.cpp textlineedit.cpp \
tokendialog.cpp barkode.cpp gnubarcode.cpp barkodeengine.cpp pixmapbarcode.cpp batchwizard.cpp \
csvfile.cpp referencecounted.cpp dstextedit.cpp encodingcombo.cpp purepostscript.cpp tbarcode2.cpp \
kactionmap.cpp
tdeactionmap.cpp
xdg_apps_DATA = kbarcode.desktop kbarcode-batch.desktop kbarcode-editor.desktop kbarcode-label.desktop kbarcode-single.desktop

@ -54,11 +54,11 @@
#include <kiconloader.h>
#include <kimageio.h>
#include <klineedit.h>
#include <klistbox.h>
#include <klistview.h>
#include <tdelistbox.h>
#include <tdelistview.h>
#include <kmessagebox.h>
#include <knuminput.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kpushbutton.h>
#include <kurlrequester.h>
#include <tqtable.h>

@ -25,12 +25,12 @@
#include <tqclipboard.h>
// KDE includes
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <keditcl.h>
#include <klocale.h>
#include <kmenubar.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstatusbar.h>
#define CUR_TABLE_ID 6666

@ -20,7 +20,7 @@
#include "confwizard.h"
#include "printersettings.h"
#include "kbarcodesettings.h"
#include "kactionmap.h"
#include "tdeactionmap.h"
#include "barkode.h"
// TQt includes
@ -29,14 +29,14 @@
#include <tqsqldatabase.h>
// KDE includes
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmenubar.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <krun.h>

@ -19,7 +19,7 @@
#define DSMAINWINDOW_H
#include <tqwidget.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
class TDEAction;
class TDEPopupMenu;

@ -30,12 +30,12 @@
#include <tqlayout.h>
// KDE includes
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kpushbutton.h>
#include <kmessagebox.h>

@ -78,7 +78,7 @@
// KDE includes
#include <kabc/stdaddressbook.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kcolordialog.h>
#include <kcommand.h>
@ -87,12 +87,12 @@
#include <kiconloader.h>
#include <kimageio.h>
#include <klineedit.h>
#include <klistbox.h>
#include <tdelistbox.h>
#include <klocale.h>
#include <kmenubar.h>
#include <kmessagebox.h>
#include <knuminput.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kpushbutton.h>
#include <kprinter.h>
#include <krun.h>

@ -19,14 +19,14 @@
#include "tokendialog.h"
// KDE includes
#include <kaction.h>
#include <tdeaction.h>
#include <tdeversion.h>
#include <kcolordialog.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <tdespell.h>
#include <dstextedit.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <kcombobox.h>
// TQt includes

@ -1,5 +1,5 @@
/***************************************************************************
kactionmap.cpp - description
tdeactionmap.cpp - description
-------------------
begin : Fri Mai 19 2006
copyright : (C) 2006 by Dominik Seichter
@ -15,7 +15,7 @@
* *
***************************************************************************/
#include "kactionmap.h"
#include "tdeactionmap.h"
#include <tqimage.h>
#include <tqlabel.h>
@ -27,11 +27,11 @@
#include <tqregexp.h>
#include <tqvbox.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <klistview.h>
#include <tdelistview.h>
#if TDE_VERSION >= 0x030500
#include <klistviewsearchline.h>
#include <tdelistviewsearchline.h>
#endif
#include <klocale.h>
@ -185,4 +185,4 @@ void TDEActionMap::updateEnabledState()
m_listView->repaintContents();
}
#include "kactionmap.moc"
#include "tdeactionmap.moc"

@ -1,5 +1,5 @@
/***************************************************************************
kactionmap.h - description
tdeactionmap.h - description
-------------------
begin : Fri Mai 19 2006
copyright : (C) 2006 by Dominik Seichter

@ -38,13 +38,13 @@
#include <kcombobox.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klineedit.h>
#include <klineeditdlg.h>
#include <klocale.h>
#include <kmenubar.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <knuminput.h>
#include <kprinter.h>
#include <kurlrequester.h>

@ -38,13 +38,13 @@
#include <kcombobox.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klineedit.h>
#include <klineeditdlg.h>
#include <klocale.h>
#include <kmenubar.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <knuminput.h>
#include <kprinter.h>
#include <kurlrequester.h>

@ -14,14 +14,14 @@
// KDE includes
#include <knuminput.h>
#include <kaction.h>
#include <tdeaction.h>
#include <tdeversion.h>
#include <kcolordialog.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <tdespell.h>
#include <klineedit.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <kcombobox.h>
// TQt includes

@ -21,8 +21,8 @@
#include "dstextedit.h"
#include <klineedit.h>
#include <klistbox.h>
#include <klistview.h>
#include <tdelistbox.h>
#include <tdelistview.h>
#include <klocale.h>
#include <tqhbox.h>

Loading…
Cancel
Save