Rename additional header files to avoid conflicts with KDE4

r14.0.x
Timothy Pearson 12 years ago
parent 84168b58b8
commit 20adf64e6b

@ -28,7 +28,7 @@
#include <utilxml.h> #include <utilxml.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
//TQt includes //TQt includes
#include <tqstring.h> #include <tqstring.h>

@ -27,7 +27,7 @@
#include <tqfileinfo.h> #include <tqfileinfo.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <iostream> #include <iostream>

@ -21,7 +21,7 @@
#include <tqstringlist.h> #include <tqstringlist.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
/** /**
* Manages the display templates used in the filters and display classes. * Manages the display templates used in the filters and display classes.

@ -24,7 +24,7 @@
#include "util/scoped_resource.h" #include "util/scoped_resource.h"
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
namespace Rendering { namespace Rendering {

@ -21,7 +21,7 @@
#include <tqptrlist.h> #include <tqptrlist.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
//initialize static language list //initialize static language list
CLanguageMgr::LanguageList CLanguageMgr::m_langList; CLanguageMgr::LanguageList CLanguageMgr::m_langList;

@ -37,7 +37,7 @@
#include <tqfileinfo.h> #include <tqfileinfo.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
#include <kstringhandler.h> #include <kstringhandler.h>
//Sword includes //Sword includes

@ -21,7 +21,7 @@
//Sword includes //Sword includes
#include <swmodule.h> #include <swmodule.h>
#include <kglobal.h> #include <tdeglobal.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
//STL includes //STL includes

@ -33,8 +33,8 @@
#include <tqfileinfo.h> #include <tqfileinfo.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
#include <kglobal.h> #include <tdeglobal.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <tdeconfig.h> #include <tdeconfig.h>

@ -28,7 +28,7 @@
#include <tqregexp.h> #include <tqregexp.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
#include <kurl.h> #include <kurl.h>
using namespace Rendering; using namespace Rendering;

@ -45,9 +45,9 @@
#include <tdeapplication.h> #include <tdeapplication.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <tdecmdlineargs.h> #include <tdecmdlineargs.h>
#include <klocale.h> #include <tdelocale.h>
#include <tdeaccel.h> #include <tdeaccel.h>
#include <kmenubar.h> #include <tdemenubar.h>
#include <tdetoolbar.h> #include <tdetoolbar.h>
#include <krandomsequence.h> #include <krandomsequence.h>

@ -53,14 +53,14 @@
#include <tdeapplication.h> #include <tdeapplication.h>
#include <tdeconfigbase.h> #include <tdeconfigbase.h>
#include <tdeversion.h> #include <tdeversion.h>
#include <kglobal.h> #include <tdeglobal.h>
#include <khelpmenu.h> #include <khelpmenu.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kmenubar.h> #include <tdemenubar.h>
#include <kstddirs.h> #include <kstddirs.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <tdetoolbar.h> #include <tdetoolbar.h>
#include <klocale.h> #include <tdelocale.h>
#include <tdepopupmenu.h> #include <tdepopupmenu.h>
#include <tdeversion.h> #include <tdeversion.h>

@ -49,10 +49,10 @@
#include <kbugreport.h> #include <kbugreport.h>
#include <tdeaboutapplication.h> #include <tdeaboutapplication.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kmenubar.h> #include <tdemenubar.h>
#include <tdeaboutdata.h> #include <tdeaboutdata.h>
#include <kglobal.h> #include <tdeglobal.h>
#include <klocale.h> #include <tdelocale.h>
#include <kedittoolbar.h> #include <kedittoolbar.h>
#include <tdepopupmenu.h> #include <tdepopupmenu.h>
#include <khelpmenu.h> #include <khelpmenu.h>

@ -18,12 +18,12 @@
//KDE includes //KDE includes
#include <tdeapplication.h> #include <tdeapplication.h>
#include <kglobal.h> #include <tdeglobal.h>
#include <klocale.h> #include <tdelocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kprocess.h> #include <kprocess.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
//Sword includes //Sword includes
#include <filemgr.h> #include <filemgr.h>

@ -34,8 +34,8 @@
#endif #endif
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kcharsets.h> #include <kcharsets.h>
#include <kglobal.h> #include <tdeglobal.h>
#include <klocale.h> #include <tdelocale.h>
#include <tdeaccel.h> #include <tdeaccel.h>
#include <kstaticdeleter.h> #include <kstaticdeleter.h>

@ -33,7 +33,7 @@
//KDE includes //KDE includes
#include <kprogress.h> #include <kprogress.h>
#include <tdefiledialog.h> #include <tdefiledialog.h>
#include <klocale.h> #include <tdelocale.h>
#include <tdeapplication.h> #include <tdeapplication.h>
//Sword includes //Sword includes

@ -38,7 +38,7 @@
#include <tqregexp.h> #include <tqregexp.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
#include <kstdaction.h> #include <kstdaction.h>

@ -20,7 +20,7 @@
#include <tqlayout.h> #include <tqlayout.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
#include <kseparator.h> #include <kseparator.h>
CInputDialog::CInputDialog(const TQString& caption, const TQString& description, const TQString& text, TQWidget *parent, const char *name, const bool modal ) : KDialog(parent,name,modal) { CInputDialog::CInputDialog(const TQString& caption, const TQString& description, const TQString& text, TQWidget *parent, const char *name, const bool modal ) : KDialog(parent,name,modal) {

@ -33,7 +33,7 @@
#include <tqcheckbox.h> #include <tqcheckbox.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
#include <tdelistview.h> #include <tdelistview.h>
#include <kiconloader.h> #include <kiconloader.h>

@ -21,7 +21,7 @@
//KDE includes //KDE includes
#include <tdepopupmenu.h> #include <tdepopupmenu.h>
#include <tdeapplication.h> #include <tdeapplication.h>
#include <klocale.h> #include <tdelocale.h>
//QT includes //QT includes
#include <tqobjectlist.h> #include <tqobjectlist.h>

@ -20,7 +20,7 @@
//KDE includes //KDE includes
#include <tdeapplication.h> #include <tdeapplication.h>
#include <kprogress.h> #include <kprogress.h>
#include <klocale.h> #include <tdelocale.h>
CModuleIndexDialog* CModuleIndexDialog::getInstance() { CModuleIndexDialog* CModuleIndexDialog::getInstance() {
static CModuleIndexDialog* instance = 0; static CModuleIndexDialog* instance = 0;

@ -49,8 +49,8 @@
//KDE includes //KDE includes
#include <kapp.h> #include <kapp.h>
#include <klocale.h> #include <tdelocale.h>
#include <kglobal.h> #include <tdeglobal.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kkeydialog.h> #include <kkeydialog.h>
#include <tdehtml_part.h> #include <tdehtml_part.h>

@ -32,7 +32,7 @@
#include <tdeaccel.h> #include <tdeaccel.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kapp.h> #include <kapp.h>
#include <klocale.h> #include <tdelocale.h>
class TQHBox; class TQHBox;
class TQCheckBox; class TQCheckBox;

@ -20,7 +20,7 @@
//KDE includes //KDE includes
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <klocale.h> #include <tdelocale.h>
#define CURRENT_SYNTAX_VERSION 2 #define CURRENT_SYNTAX_VERSION 2

@ -39,10 +39,10 @@
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kdirselectdialog.h> #include <kdirselectdialog.h>
#include <keditlistbox.h> #include <keditlistbox.h>
#include <klocale.h> #include <tdelocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kprogress.h> #include <kprogress.h>
#include <kurl.h> #include <kurl.h>

@ -23,7 +23,7 @@
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <klocale.h> #include <tdelocale.h>
#include <kdirselectdialog.h> #include <kdirselectdialog.h>
namespace BookshelfManager { namespace BookshelfManager {

@ -22,7 +22,7 @@
#include <tqtooltip.h> #include <tqtooltip.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
#include <kiconloader.h> #include <kiconloader.h>
using namespace sword; using namespace sword;

@ -27,7 +27,7 @@
//KDE includes //KDE includes
#include <tdeapplication.h> #include <tdeapplication.h>
#include <tdefiledialog.h> #include <tdefiledialog.h>
#include <klocale.h> #include <tdelocale.h>
CDisplayConnections::CDisplayConnections( CDisplay* display ) : m_display(display) {} CDisplayConnections::CDisplayConnections( CDisplay* display ) : m_display(display) {}

@ -43,7 +43,7 @@
//KDE includes //KDE includes
#include <tdeapplication.h> #include <tdeapplication.h>
#include <tdehtmlview.h> #include <tdehtmlview.h>
#include <kglobalsettings.h> #include <tdeglobalsettings.h>
#include <tdehtml_events.h> #include <tdehtml_events.h>
#include <dom/dom2_range.h> #include <dom/dom2_range.h>

@ -22,7 +22,7 @@
//KDE includes //KDE includes
#include <tdeaction.h> #include <tdeaction.h>
#include <tdetoolbar.h> #include <tdetoolbar.h>
#include <klocale.h> #include <tdelocale.h>
#include <tdefontcombo.h> #include <tdefontcombo.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <tdepopupmenu.h> #include <tdepopupmenu.h>

@ -21,7 +21,7 @@
//KDE includes //KDE includes
#include <tdeaction.h> #include <tdeaction.h>
#include <klocale.h> #include <tdelocale.h>
CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent) : TQTextEdit(parentWindow ? parentWindow : parent), CWriteDisplay(parentWindow) { CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent) : TQTextEdit(parentWindow ? parentWindow : parent), CWriteDisplay(parentWindow) {
setTextFormat(TQt::PlainText); setTextFormat(TQt::PlainText);

@ -32,7 +32,7 @@
#include <tqpopupmenu.h> #include <tqpopupmenu.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
CReadDisplay::CReadDisplay(CReadWindow* readWindow) : CReadDisplay::CReadDisplay(CReadWindow* readWindow) :
CDisplay(readWindow), CDisplay(readWindow),

@ -35,7 +35,7 @@
//KDE includes //KDE includes
#include <tdeaccel.h> #include <tdeaccel.h>
#include <klocale.h> #include <tdelocale.h>
#include <tdepopupmenu.h> #include <tdepopupmenu.h>
using namespace Profile; using namespace Profile;

@ -28,7 +28,7 @@
//KDE includes //KDE includes
#include <tdeaction.h> #include <tdeaction.h>
#include <klocale.h> #include <tdelocale.h>
#include <tdeversion.h> #include <tdeversion.h>
using namespace Profile; using namespace Profile;

@ -22,7 +22,7 @@
//KDE includes //KDE includes
#include <tdepopupmenu.h> #include <tdepopupmenu.h>
#include <klocale.h> #include <tdelocale.h>
// CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, TQWidget *parent, const char *name ) // CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, TQWidget *parent, const char *name )

@ -26,7 +26,7 @@
//KDE includes //KDE includes
#include <tdeaction.h> #include <tdeaction.h>
#include <tdeaccel.h> #include <tdeaccel.h>
#include <klocale.h> #include <tdelocale.h>
#include <tdepopupmenu.h> #include <tdepopupmenu.h>
using namespace Profile; using namespace Profile;

@ -44,7 +44,7 @@
//KDE includes //KDE includes
#include <tdeversion.h> #include <tdeversion.h>
#include <tdeaccel.h> #include <tdeaccel.h>
#include <klocale.h> #include <tdelocale.h>
using namespace Profile; using namespace Profile;

@ -21,7 +21,7 @@
//KDE includes //KDE includes
#include <tdeaction.h> #include <tdeaction.h>
#include <klocale.h> #include <tdelocale.h>
using namespace Profile; using namespace Profile;

@ -31,7 +31,7 @@
//KDE includes //KDE includes
#include <tdeaccel.h> #include <tdeaccel.h>
#include <tdetoolbar.h> #include <tdetoolbar.h>
#include <klocale.h> #include <tdelocale.h>
#include <tdepopupmenu.h> #include <tdepopupmenu.h>
#include <tdeversion.h> #include <tdeversion.h>
// #include <tdeactionclasses.h> // #include <tdeactionclasses.h>

@ -23,8 +23,8 @@
#include <tqvaluelist.h> #include <tqvaluelist.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
#include <kglobal.h> #include <tdeglobal.h>
#include <kiconloader.h> #include <kiconloader.h>
CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule,CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *parent, const char *name ) CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule,CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *parent, const char *name )

@ -23,8 +23,8 @@
//KDE includes //KDE includes
#include <tdeaction.h> #include <tdeaction.h>
#include <tdeaccel.h> #include <tdeaccel.h>
#include <klocale.h> #include <tdelocale.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
using namespace Profile; using namespace Profile;

@ -31,7 +31,7 @@
#include <tdeaction.h> #include <tdeaction.h>
#include <tdeaccel.h> #include <tdeaccel.h>
#include <tdestdaccel.h> #include <tdestdaccel.h>
#include <klocale.h> #include <tdelocale.h>
using namespace Profile; using namespace Profile;

@ -17,8 +17,8 @@
#include "frontend/cprofilewindow.h" #include "frontend/cprofilewindow.h"
//KDE includes //KDE includes
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <klocale.h> #include <tdelocale.h>
using namespace Profile; using namespace Profile;

@ -26,7 +26,7 @@
#include <tqpushbutton.h> #include <tqpushbutton.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
CBibleKeyChooser::CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent, const char *name ) CBibleKeyChooser::CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent, const char *name )
: CKeyChooser(modules, key, parent, name), : CKeyChooser(modules, key, parent, name),

@ -25,9 +25,9 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <kcompletion.h> #include <kcompletion.h>
#include <kglobalsettings.h> #include <tdeglobalsettings.h>
#include <tdecompletionbox.h> #include <tdecompletionbox.h>
#include <klocale.h> #include <tdelocale.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kguiitem.h> #include <kguiitem.h>

@ -29,7 +29,7 @@
#include <tqlistbox.h> #include <tqlistbox.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
CLexiconKeyChooser::CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent, const char *name ) CLexiconKeyChooser::CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent, const char *name )
: CKeyChooser(modules, key, parent, name), : CKeyChooser(modules, key, parent, name),

@ -21,7 +21,7 @@
#include "backend/cswordversekey.h" #include "backend/cswordversekey.h"
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
//CRefSelectDialog::CRefSelectDialog(TQWidget *parent) //CRefSelectDialog::CRefSelectDialog(TQWidget *parent)

@ -42,7 +42,7 @@
//KDE includes //KDE includes
#include <tdeconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <tdelocale.h>
#include <tdefiledialog.h> #include <tdefiledialog.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

@ -34,11 +34,11 @@
#include <tqregexp.h> #include <tqregexp.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <tdepopupmenu.h> #include <tdepopupmenu.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kglobalsettings.h> #include <tdeglobalsettings.h>
using namespace Printing; using namespace Printing;

@ -1,5 +1,5 @@
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <tdelocale.h>
/**************************************************************************** /****************************************************************************
** Form implementation generated from reading ui file './manageindicesform.ui' ** Form implementation generated from reading ui file './manageindicesform.ui'
** **

@ -38,7 +38,7 @@
//KDE includes //KDE includes
#include <tdeapplication.h> #include <tdeapplication.h>
#include <tdefiledialog.h> #include <tdefiledialog.h>
#include <klocale.h> #include <tdelocale.h>
#include <kiconloader.h> #include <kiconloader.h>
namespace Search { namespace Search {

@ -22,7 +22,7 @@
//TQt includes //TQt includes
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
#include <tdeaction.h> #include <tdeaction.h>
#include <tdepopupmenu.h> #include <tdepopupmenu.h>

@ -38,7 +38,7 @@
//KDE includes //KDE includes
#include <tdeapplication.h> #include <tdeapplication.h>
#include <tdefiledialog.h> #include <tdefiledialog.h>
#include <klocale.h> #include <tdelocale.h>
#include <kiconloader.h> #include <kiconloader.h>
namespace Search { namespace Search {

@ -39,7 +39,7 @@
//KDE includes //KDE includes
#include <tdeapplication.h> #include <tdeapplication.h>
#include <tdefiledialog.h> #include <tdefiledialog.h>
#include <klocale.h> #include <tdelocale.h>
#include <kiconloader.h> #include <kiconloader.h>
namespace Search { namespace Search {

@ -42,7 +42,7 @@
//KDE includes //KDE includes
#include <tdeapplication.h> #include <tdeapplication.h>
#include <tdefiledialog.h> #include <tdefiledialog.h>
#include <klocale.h> #include <tdelocale.h>
#include <kiconloader.h> #include <kiconloader.h>
namespace Search { namespace Search {

@ -35,10 +35,10 @@
#include <tqeventloop.h> #include <tqeventloop.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kprogress.h> #include <kprogress.h>
#include <tdeapplication.h> #include <tdeapplication.h>

@ -21,7 +21,7 @@
//TQt includes //TQt includes
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
#include <tdeaction.h> #include <tdeaction.h>
#include <tdepopupmenu.h> #include <tdepopupmenu.h>

@ -1,5 +1,5 @@
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <tdelocale.h>
/**************************************************************************** /****************************************************************************
** Form implementation generated from reading ui file './searchoptionsform.ui' ** Form implementation generated from reading ui file './searchoptionsform.ui'
** **

@ -1,5 +1,5 @@
#include <kdialog.h> #include <kdialog.h>
#include <klocale.h> #include <tdelocale.h>
/**************************************************************************** /****************************************************************************
** Form implementation generated from reading ui file './searchresultsform.ui' ** Form implementation generated from reading ui file './searchresultsform.ui'
** **

@ -36,12 +36,12 @@
//KDE includes //KDE includes
#include <tdecmdlineargs.h> #include <tdecmdlineargs.h>
#include <kcrash.h> #include <kcrash.h>
#include <kglobal.h> #include <tdeglobal.h>
#include <tdeapplication.h> #include <tdeapplication.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kinstance.h> #include <kinstance.h>
#include <tdeaboutdata.h> #include <tdeaboutdata.h>
#include <klocale.h> #include <tdelocale.h>
bool showDebugMessages = false; bool showDebugMessages = false;
BibleTime* bibletime_ptr = 0; BibleTime* bibletime_ptr = 0;

@ -15,8 +15,8 @@
#include "backend/cswordbackend.h" #include "backend/cswordbackend.h"
//KDE includes //KDE includes
#include <kglobal.h> #include <tdeglobal.h>
#include <klocale.h> #include <tdelocale.h>
namespace CResMgr { namespace CResMgr {
namespace modules { namespace modules {

@ -24,11 +24,11 @@
#include <tqregexp.h> #include <tqregexp.h>
//KDE includes //KDE includes
#include <klocale.h> #include <tdelocale.h>
#include <kglobal.h> #include <tdeglobal.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kmessagebox.h> #include <tdemessagebox.h>
#include <kurl.h> #include <kurl.h>
#include <tdefiledialog.h> #include <tdefiledialog.h>
#include <tdeapplication.h> #include <tdeapplication.h>

Loading…
Cancel
Save