TDE
/
bibletime
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/bibletime
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename additional header files to avoid conflicts with KDE4

Browse Source
r14.0.x
Timothy Pearson 12 years ago
parent 84168b58b8
commit 20adf64e6b
61 changed files with 83 additions and 83 deletions
Show Stats Download Patch File Download Diff File

2
bibletime/backend/bt_osishtml.cpp
Unescape View File

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

2
bibletime/backend/cdisplaytemplatemgr.cpp
Unescape View File

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

2
bibletime/backend/cdisplaytemplatemgr.h
Unescape View File

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

2
bibletime/backend/chtmlexportrendering.cpp
Unescape View File

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

2
bibletime/backend/clanguagemgr.cpp
Unescape View File

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

2
bibletime/backend/cswordbackend.cpp
Unescape View File

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

2
bibletime/backend/cswordlexiconmoduleinfo.cpp
Unescape View File

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

4
bibletime/backend/cswordmoduleinfo.cpp
Unescape View File

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

2
bibletime/backend/ctextrendering.cpp
Unescape View File

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

4
bibletime/bibletime.cpp
Unescape View File

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

6
bibletime/bibletime_init.cpp
Unescape View File

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

6
bibletime/bibletime_slots.cpp
Unescape View File

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

6
bibletime/frontend/btinstallmgr.cpp
Unescape View File

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

4
bibletime/frontend/cbtconfig.cpp
Unescape View File

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

2
bibletime/frontend/cexportmanager.cpp
Unescape View File

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

2
bibletime/frontend/cinfodisplay.cpp
Unescape View File

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

2
bibletime/frontend/cinputdialog.cpp
Unescape View File

@ -20,7 +20,7 @@
#include <tqlayout.h>
//KDE includes
#include <klocale.h>
#include <tdelocale.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) {

2
bibletime/frontend/cmanageindiceswidget.cpp
Unescape View File

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

2
bibletime/frontend/cmdiarea.cpp
Unescape View File

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

2
bibletime/frontend/cmoduleindexdialog.cpp
Unescape View File

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

4
bibletime/frontend/coptionsdialog.cpp
Unescape View File

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

2
bibletime/frontend/coptionsdialog.h
Unescape View File

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

2
bibletime/frontend/cprofile.cpp
Unescape View File

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

4
bibletime/frontend/cswordsetupdialog.cpp
Unescape View File

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

2
bibletime/frontend/cswordsetupinstallsourcesdialog.cpp
Unescape View File

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

2
bibletime/frontend/cswordsetupmodulelistview.cpp
Unescape View File

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

2
bibletime/frontend/display/cdisplay.cpp
Unescape View File

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

2
bibletime/frontend/display/chtmlreaddisplay.cpp
Unescape View File

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

2
bibletime/frontend/display/chtmlwritedisplay.cpp
Unescape View File

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

2
bibletime/frontend/display/cplainwritedisplay.cpp
Unescape View File

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

2
bibletime/frontend/display/creaddisplay.cpp
Unescape View File

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

2
bibletime/frontend/displaywindow/cbiblereadwindow.cpp
Unescape View File

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

2
bibletime/frontend/displaywindow/cbookreadwindow.cpp
Unescape View File

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

2
bibletime/frontend/displaywindow/cbuttons.cpp
Unescape View File

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

2
bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
Unescape View File

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

2
bibletime/frontend/displaywindow/cdisplaywindow.cpp
Unescape View File

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

2
bibletime/frontend/displaywindow/chtmlwritewindow.cpp
Unescape View File

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

2
bibletime/frontend/displaywindow/clexiconreadwindow.cpp
Unescape View File

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

4
bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
Unescape View File

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

4
bibletime/frontend/displaywindow/cplainwritewindow.cpp
Unescape View File

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

2
bibletime/frontend/displaywindow/creadwindow.cpp
Unescape View File

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

4
bibletime/frontend/displaywindow/cwritewindow.cpp
Unescape View File

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

2
bibletime/frontend/keychooser/cbiblekeychooser.cpp
Unescape View File

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

4
bibletime/frontend/keychooser/ckeyreferencewidget.cpp
Unescape View File

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

2
bibletime/frontend/keychooser/clexiconkeychooser.cpp
Unescape View File

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

2
bibletime/frontend/keychooser/crefselectdialog.cpp
Unescape View File

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

2
bibletime/frontend/mainindex/cindexitem.cpp
Unescape View File

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

6
bibletime/frontend/mainindex/cmainindex.cpp
Unescape View File

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

2
bibletime/frontend/manageindicesform.cpp
Unescape View File

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

2
bibletime/frontend/searchdialog/cmodulechooser.cpp
Unescape View File

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

2
bibletime/frontend/searchdialog/cmoduleresultview.cpp
Unescape View File

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

2
bibletime/frontend/searchdialog/crangechooser.cpp
Unescape View File

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

2
bibletime/frontend/searchdialog/csearchanalysis.cpp
Unescape View File

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

2
bibletime/frontend/searchdialog/csearchdialog.cpp
Unescape View File

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

4
bibletime/frontend/searchdialog/csearchdialogpages.cpp
Unescape View File

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

2
bibletime/frontend/searchdialog/csearchresultview.cpp
Unescape View File

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

2
bibletime/frontend/searchdialog/searchoptionsform.cpp
Unescape View File

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

2
bibletime/frontend/searchdialog/searchresultsform.cpp
Unescape View File

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

4
bibletime/main.cpp
Unescape View File

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

4
bibletime/util/cresmgr.cpp
Unescape View File

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

6
bibletime/util/ctoolclass.cpp
Unescape View File

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

Write Preview
Loading…
Cancel
Save