summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit50d6a8e70ca7a43d45560ef8333db9bccbbe66f7 (patch)
tree670b64ec178f4113594db7808cc63a934a4582de
parentfbb51be9cf90010543720218379f0cba3e009302 (diff)
downloadbibletime-50d6a8e7.tar.gz
bibletime-50d6a8e7.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/bibletime@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--bibletime/backend/cswordbookmoduleinfo.h2
-rw-r--r--bibletime/bibletime_slots.cpp2
-rw-r--r--bibletime/frontend/btinstallmgr.cpp2
-rw-r--r--bibletime/frontend/cinfodisplay.cpp6
-rw-r--r--bibletime/frontend/cinfodisplay.h2
-rw-r--r--bibletime/frontend/cinputdialog.cpp6
-rw-r--r--bibletime/frontend/cinputdialog.h4
-rw-r--r--bibletime/frontend/cmanageindiceswidget.cpp4
-rw-r--r--bibletime/frontend/cmanageindiceswidget.h2
-rw-r--r--bibletime/frontend/cmdiarea.cpp4
-rw-r--r--bibletime/frontend/cmdiarea.h2
-rw-r--r--bibletime/frontend/coptionsdialog.cpp6
-rw-r--r--bibletime/frontend/coptionsdialog.h2
-rw-r--r--bibletime/frontend/cprinter.h2
-rw-r--r--bibletime/frontend/cswordsetupdialog.cpp4
-rw-r--r--bibletime/frontend/cswordsetupdialog.h2
-rw-r--r--bibletime/frontend/cswordsetupinstallsourcesdialog.cpp2
-rw-r--r--bibletime/frontend/cswordsetupmodulelistview.cpp30
-rw-r--r--bibletime/frontend/cswordsetupmodulelistview.h2
-rw-r--r--bibletime/frontend/display/cdisplay.cpp14
-rw-r--r--bibletime/frontend/display/cdisplay.h10
-rw-r--r--bibletime/frontend/display/chtmlreaddisplay.cpp2
-rw-r--r--bibletime/frontend/display/chtmlreaddisplay.h4
-rw-r--r--bibletime/frontend/display/chtmlwritedisplay.cpp4
-rw-r--r--bibletime/frontend/display/chtmlwritedisplay.h2
-rw-r--r--bibletime/frontend/display/cplainwritedisplay.cpp2
-rw-r--r--bibletime/frontend/display/cplainwritedisplay.h2
-rw-r--r--bibletime/frontend/displaywindow/cbiblereadwindow.cpp2
-rw-r--r--bibletime/frontend/displaywindow/cbiblereadwindow.h2
-rw-r--r--bibletime/frontend/displaywindow/cbookreadwindow.cpp2
-rw-r--r--bibletime/frontend/displaywindow/cbookreadwindow.h2
-rw-r--r--bibletime/frontend/displaywindow/cbuttons.cpp8
-rw-r--r--bibletime/frontend/displaywindow/cbuttons.h4
-rw-r--r--bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp2
-rw-r--r--bibletime/frontend/displaywindow/ccommentaryreadwindow.h2
-rw-r--r--bibletime/frontend/displaywindow/cdisplaywindow.cpp24
-rw-r--r--bibletime/frontend/displaywindow/cdisplaywindow.h6
-rw-r--r--bibletime/frontend/displaywindow/chtmlwritewindow.cpp4
-rw-r--r--bibletime/frontend/displaywindow/chtmlwritewindow.h2
-rw-r--r--bibletime/frontend/displaywindow/clexiconreadwindow.cpp2
-rw-r--r--bibletime/frontend/displaywindow/clexiconreadwindow.h2
-rw-r--r--bibletime/frontend/displaywindow/cmodulechooserbar.cpp4
-rw-r--r--bibletime/frontend/displaywindow/cmodulechooserbar.h2
-rw-r--r--bibletime/frontend/displaywindow/cmodulechooserbutton.cpp6
-rw-r--r--bibletime/frontend/displaywindow/cmodulechooserbutton.h2
-rw-r--r--bibletime/frontend/displaywindow/cplainwritewindow.cpp2
-rw-r--r--bibletime/frontend/displaywindow/cplainwritewindow.h2
-rw-r--r--bibletime/frontend/displaywindow/creadwindow.cpp4
-rw-r--r--bibletime/frontend/displaywindow/creadwindow.h2
-rw-r--r--bibletime/frontend/displaywindow/cwritewindow.cpp4
-rw-r--r--bibletime/frontend/displaywindow/cwritewindow.h2
-rw-r--r--bibletime/frontend/keychooser/cbiblekeychooser.cpp4
-rw-r--r--bibletime/frontend/keychooser/cbiblekeychooser.h2
-rw-r--r--bibletime/frontend/keychooser/cbookkeychooser.cpp4
-rw-r--r--bibletime/frontend/keychooser/cbookkeychooser.h4
-rw-r--r--bibletime/frontend/keychooser/cbooktreechooser.cpp14
-rw-r--r--bibletime/frontend/keychooser/cbooktreechooser.h6
-rw-r--r--bibletime/frontend/keychooser/ckeychooser.cpp12
-rw-r--r--bibletime/frontend/keychooser/ckeychooser.h6
-rw-r--r--bibletime/frontend/keychooser/ckeychooserwidget.cpp8
-rw-r--r--bibletime/frontend/keychooser/ckeychooserwidget.h6
-rw-r--r--bibletime/frontend/keychooser/ckeyreferencewidget.cpp4
-rw-r--r--bibletime/frontend/keychooser/ckeyreferencewidget.h4
-rw-r--r--bibletime/frontend/keychooser/clexiconkeychooser.cpp4
-rw-r--r--bibletime/frontend/keychooser/clexiconkeychooser.h2
-rw-r--r--bibletime/frontend/keychooser/crefselectdialog.cpp8
-rw-r--r--bibletime/frontend/keychooser/crefselectdialog.h2
-rw-r--r--bibletime/frontend/keychooser/cscrollbutton.cpp2
-rw-r--r--bibletime/frontend/keychooser/cscrollbutton.h2
-rw-r--r--bibletime/frontend/keychooser/cscrollerwidgetset.cpp2
-rw-r--r--bibletime/frontend/keychooser/cscrollerwidgetset.h2
-rw-r--r--bibletime/frontend/mainindex/cindexitem.cpp16
-rw-r--r--bibletime/frontend/mainindex/cmainindex.cpp26
-rw-r--r--bibletime/frontend/mainindex/cmainindex.h4
-rw-r--r--bibletime/frontend/manageindicesform.cpp6
-rw-r--r--bibletime/frontend/searchdialog/cmodulechooser.cpp2
-rw-r--r--bibletime/frontend/searchdialog/cmodulechooser.h2
-rw-r--r--bibletime/frontend/searchdialog/cmoduleresultview.cpp14
-rw-r--r--bibletime/frontend/searchdialog/cmoduleresultview.h4
-rw-r--r--bibletime/frontend/searchdialog/csearchanalysis.cpp18
-rw-r--r--bibletime/frontend/searchdialog/csearchanalysis.h12
-rw-r--r--bibletime/frontend/searchdialog/csearchdialog.cpp4
-rw-r--r--bibletime/frontend/searchdialog/csearchdialog.h2
-rw-r--r--bibletime/frontend/searchdialog/csearchdialogpages.cpp8
-rw-r--r--bibletime/frontend/searchdialog/csearchdialogpages.h4
-rw-r--r--bibletime/frontend/searchdialog/csearchresultview.cpp4
-rw-r--r--bibletime/frontend/searchdialog/csearchresultview.h2
-rw-r--r--bibletime/frontend/searchdialog/searchoptionsform.cpp6
-rw-r--r--bibletime/frontend/searchdialog/searchresultsform.cpp6
-rw-r--r--bibletime/frontend/util/csortlistviewitem.cpp26
-rw-r--r--bibletime/frontend/util/csortlistviewitem.h14
-rw-r--r--bibletime/util/ctoolclass.cpp4
-rw-r--r--bibletime/util/ctoolclass.h2
93 files changed, 252 insertions, 252 deletions
diff --git a/bibletime/backend/cswordbookmoduleinfo.h b/bibletime/backend/cswordbookmoduleinfo.h
index 574168f..28e9d75 100644
--- a/bibletime/backend/cswordbookmoduleinfo.h
+++ b/bibletime/backend/cswordbookmoduleinfo.h
@@ -27,7 +27,7 @@ class CSwordBookModuleInfo : public CSwordModuleInfo {
public:
/** Constructor.
* @param module The module which belongs to this object
- * @param backend The tqparent backend for this book module.
+ * @param backend The parent backend for this book module.
*/
CSwordBookModuleInfo( sword::SWModule* module, CSwordBackend* const backend = CPointers::backend() );
/** Copy constructor.
diff --git a/bibletime/bibletime_slots.cpp b/bibletime/bibletime_slots.cpp
index faf63eb..cff5fe6 100644
--- a/bibletime/bibletime_slots.cpp
+++ b/bibletime/bibletime_slots.cpp
@@ -324,7 +324,7 @@ void BibleTime::slotToggleToolbar() {
/** Shows or hides the groupmanager.
*/
void BibleTime::slotToggleMainIndex() {
- //we use the tqparent widget because the main index is enclosed in a tqlayout which adds the label at the top
+ //we use the parent widget because the main index is enclosed in a tqlayout which adds the label at the top
if (m_viewMainIndex_action->isChecked()) {
m_mainIndex->parentWidget()->show();
}
diff --git a/bibletime/frontend/btinstallmgr.cpp b/bibletime/frontend/btinstallmgr.cpp
index fbe6204..b240393 100644
--- a/bibletime/frontend/btinstallmgr.cpp
+++ b/bibletime/frontend/btinstallmgr.cpp
@@ -91,7 +91,7 @@ namespace BookshelfManager {
filename = LocalConfig::swordConfigFilename();
directAccess = true;
}
- else if ( !i.exists() && dirInfo.isWritable() ) { // if the file doesn't exist but th etqparent is writable for us, create it
+ else if ( !i.exists() && dirInfo.isWritable() ) { // if the file doesn't exist but th eparent is writable for us, create it
filename = LocalConfig::swordConfigFilename();
directAccess = true;
}
diff --git a/bibletime/frontend/cinfodisplay.cpp b/bibletime/frontend/cinfodisplay.cpp
index 5bbe565..499dc30 100644
--- a/bibletime/frontend/cinfodisplay.cpp
+++ b/bibletime/frontend/cinfodisplay.cpp
@@ -47,8 +47,8 @@ using namespace sword;
namespace InfoDisplay {
- CInfoDisplay::CInfoDisplay(TQWidget *tqparent, const char *name)
-: TQWidget(tqparent, name) {
+ CInfoDisplay::CInfoDisplay(TQWidget *parent, const char *name)
+: TQWidget(parent, name) {
TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
TQLabel* headingLabel = new TQLabel(i18n("Mag (\"shift\" to lock)"),this);
headingLabel->setMargin(5);
@@ -267,7 +267,7 @@ namespace InfoDisplay {
}
// qWarning("rendered the tree: %s", renderer.renderKeyTree(tree).latin1());
- //spanns containing rtl text need dir=rtl on their tqparent tag to be aligned properly
+ //spanns containing rtl text need dir=rtl on their parent tag to be aligned properly
return TQString("<div class=\"crossrefinfo\"><h3>%1</h3><div class=\"para\" dir=\"%2\">%3</div></div>")
.tqarg(i18n("Cross references"))
.tqarg(module ? ((module->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl") : "")
diff --git a/bibletime/frontend/cinfodisplay.h b/bibletime/frontend/cinfodisplay.h
index c75dbf1..d2e5653 100644
--- a/bibletime/frontend/cinfodisplay.h
+++ b/bibletime/frontend/cinfodisplay.h
@@ -46,7 +46,7 @@ public:
typedef TQPair<InfoType, TQString> InfoData;
typedef TQValueList<InfoData> ListInfoData;
- CInfoDisplay(TQWidget *tqparent = 0, const char *name = 0);
+ CInfoDisplay(TQWidget *parent = 0, const char *name = 0);
virtual ~CInfoDisplay();
void setInfo(const InfoType, const TQString& data);
diff --git a/bibletime/frontend/cinputdialog.cpp b/bibletime/frontend/cinputdialog.cpp
index b1d7710..f3aa4b8 100644
--- a/bibletime/frontend/cinputdialog.cpp
+++ b/bibletime/frontend/cinputdialog.cpp
@@ -23,7 +23,7 @@
#include <klocale.h>
#include <kseparator.h>
-CInputDialog::CInputDialog(const TQString& caption, const TQString& description, const TQString& text, TQWidget *tqparent, const char *name, const bool modal ) : KDialog(tqparent,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) {
setPlainCaption(caption);
TQVBoxLayout* topLayout = new TQVBoxLayout(this, 5,5);
@@ -76,8 +76,8 @@ const TQString CInputDialog::text() {
}
/** A static function to get some using CInputDialog. */
-const TQString CInputDialog::getText( const TQString& caption, const TQString& description, const TQString& text, bool* ok, TQWidget* tqparent, bool modal) {
- CInputDialog* dlg = new CInputDialog(caption, description, text, tqparent, "", modal);
+const TQString CInputDialog::getText( const TQString& caption, const TQString& description, const TQString& text, bool* ok, TQWidget* parent, bool modal) {
+ CInputDialog* dlg = new CInputDialog(caption, description, text, parent, "", modal);
TQString ret = TQString();
const bool isOk = (dlg->exec() == CInputDialog::Accepted);
diff --git a/bibletime/frontend/cinputdialog.h b/bibletime/frontend/cinputdialog.h
index 5fb1167..6b5cd33 100644
--- a/bibletime/frontend/cinputdialog.h
+++ b/bibletime/frontend/cinputdialog.h
@@ -26,11 +26,11 @@ class CInputDialog : public KDialog {
Q_OBJECT
TQ_OBJECT
public:
- CInputDialog(const TQString& caption, const TQString& description, const TQString& text, TQWidget *tqparent=0, const char *name=0, const bool modal = true);
+ CInputDialog(const TQString& caption, const TQString& description, const TQString& text, TQWidget *parent=0, const char *name=0, const bool modal = true);
/**
* A static function to get some using CInputDialog.
*/
- static const TQString getText( const TQString& caption, const TQString& description, const TQString& text = TQString(), bool* ok = 0, TQWidget* tqparent = 0, bool modal = true);
+ static const TQString getText( const TQString& caption, const TQString& description, const TQString& text = TQString(), bool* ok = 0, TQWidget* parent = 0, bool modal = true);
/**
* Returns the text entered at the moment.
*/
diff --git a/bibletime/frontend/cmanageindiceswidget.cpp b/bibletime/frontend/cmanageindiceswidget.cpp
index eb22c43..a4ebb0d 100644
--- a/bibletime/frontend/cmanageindiceswidget.cpp
+++ b/bibletime/frontend/cmanageindiceswidget.cpp
@@ -40,8 +40,8 @@
namespace BookshelfManager {
/** Constructor */
-CManageIndicesWidget::CManageIndicesWidget(TQWidget* tqparent, const char* name) :
- ManageIndicesForm(tqparent, name) {
+CManageIndicesWidget::CManageIndicesWidget(TQWidget* parent, const char* name) :
+ ManageIndicesForm(parent, name) {
initView();
populateModuleList();
diff --git a/bibletime/frontend/cmanageindiceswidget.h b/bibletime/frontend/cmanageindiceswidget.h
index d4f5f9d..4bafce7 100644
--- a/bibletime/frontend/cmanageindiceswidget.h
+++ b/bibletime/frontend/cmanageindiceswidget.h
@@ -34,7 +34,7 @@ public:
/**
* Constructor
*/
- CManageIndicesWidget(TQWidget* tqparent, const char* name = 0);
+ CManageIndicesWidget(TQWidget* parent, const char* name = 0);
/**
* Destructor
diff --git a/bibletime/frontend/cmdiarea.cpp b/bibletime/frontend/cmdiarea.cpp
index 01b4065..8cef49d 100644
--- a/bibletime/frontend/cmdiarea.cpp
+++ b/bibletime/frontend/cmdiarea.cpp
@@ -30,8 +30,8 @@
#include <tqtimer.h>
-CMDIArea::CMDIArea(TQWidget *tqparent, const char *name )
-: TQWorkspace(tqparent, name),
+CMDIArea::CMDIArea(TQWidget *parent, const char *name )
+: TQWorkspace(parent, name),
m_guiOption(Nothing),
m_childEvent(false),
m_appCaption(TQString()) {
diff --git a/bibletime/frontend/cmdiarea.h b/bibletime/frontend/cmdiarea.h
index 86da1c6..18499ab 100644
--- a/bibletime/frontend/cmdiarea.h
+++ b/bibletime/frontend/cmdiarea.h
@@ -44,7 +44,7 @@ public:
autoCascade,
Nothing
};
- CMDIArea(TQWidget *tqparent, const char *name = 0 );
+ CMDIArea(TQWidget *parent, const char *name = 0 );
/**
*/
void readSettings();
diff --git a/bibletime/frontend/coptionsdialog.cpp b/bibletime/frontend/coptionsdialog.cpp
index 9826130..7191b17 100644
--- a/bibletime/frontend/coptionsdialog.cpp
+++ b/bibletime/frontend/coptionsdialog.cpp
@@ -71,8 +71,8 @@
using std::string;
using std::list;
-COptionsDialog::COptionsDialog(TQWidget *tqparent, const char *name, KActionCollection* actionCollection )
-: KDialogBase(IconList, i18n("Configure BibleTime"), Ok | Cancel | Apply, Ok, tqparent, name, true, true, TQString(), TQString(), TQString()) {
+COptionsDialog::COptionsDialog(TQWidget *parent, const char *name, KActionCollection* actionCollection )
+: KDialogBase(IconList, i18n("Configure BibleTime"), Ok | Cancel | Apply, Ok, parent, name, true, true, TQString(), TQString(), TQString()) {
m_settings.keys.application.actionCollection = actionCollection;
setIconListAllVisible(true);
@@ -84,7 +84,7 @@ COptionsDialog::COptionsDialog(TQWidget *tqparent, const char *name, KActionColl
}
COptionsDialog::~COptionsDialog() {
- //the actionCollections objects are deleted by their TQWidget tqparent
+ //the actionCollections objects are deleted by their TQWidget parent
}
/** */
diff --git a/bibletime/frontend/coptionsdialog.h b/bibletime/frontend/coptionsdialog.h
index 872d7ef..dbac0a2 100644
--- a/bibletime/frontend/coptionsdialog.h
+++ b/bibletime/frontend/coptionsdialog.h
@@ -55,7 +55,7 @@ class COptionsDialog : public KDialogBase, public CPointers {
TQ_OBJECT
public:
- COptionsDialog(TQWidget *tqparent, const char *name, KActionCollection* actionCollection);
+ COptionsDialog(TQWidget *parent, const char *name, KActionCollection* actionCollection);
virtual ~COptionsDialog();
enum Parts {
diff --git a/bibletime/frontend/cprinter.h b/bibletime/frontend/cprinter.h
index 305aa0b..67dab27 100644
--- a/bibletime/frontend/cprinter.h
+++ b/bibletime/frontend/cprinter.h
@@ -36,7 +36,7 @@ class CPrinter : public TQObject, public Rendering::CDisplayRendering {
TQ_OBJECT
public:
CPrinter(
- TQObject *tqparent, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions
+ TQObject *parent, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions
);
virtual ~CPrinter();
diff --git a/bibletime/frontend/cswordsetupdialog.cpp b/bibletime/frontend/cswordsetupdialog.cpp
index 41c8b7b..c527325 100644
--- a/bibletime/frontend/cswordsetupdialog.cpp
+++ b/bibletime/frontend/cswordsetupdialog.cpp
@@ -55,8 +55,8 @@ using namespace sword;
namespace BookshelfManager {
- CSwordSetupDialog::CSwordSetupDialog(TQWidget *tqparent, const char *name )
-: KDialogBase(IconList, i18n("Bookshelf Manager"), Ok, Ok, tqparent, name, true, true, TQString(), TQString(), TQString()),
+ CSwordSetupDialog::CSwordSetupDialog(TQWidget *parent, const char *name )
+: KDialogBase(IconList, i18n("Bookshelf Manager"), Ok, Ok, parent, name, true, true, TQString(), TQString(), TQString()),
m_removeModuleListView(0),
m_installModuleListPage(0),
m_installModuleListView(0),
diff --git a/bibletime/frontend/cswordsetupdialog.h b/bibletime/frontend/cswordsetupdialog.h
index d456a7b..5b12c93 100644
--- a/bibletime/frontend/cswordsetupdialog.h
+++ b/bibletime/frontend/cswordsetupdialog.h
@@ -47,7 +47,7 @@ class CSwordSetupDialog : public KDialogBase, public CPointers {
TQ_OBJECT
public:
- CSwordSetupDialog(TQWidget *tqparent=0, const char *name=0);
+ CSwordSetupDialog(TQWidget *parent=0, const char *name=0);
enum Parts {
Sword,
diff --git a/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp b/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp
index 2e9115c..8778e8b 100644
--- a/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp
+++ b/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp
@@ -32,7 +32,7 @@ namespace BookshelfManager {
const TQString PROTO_FTP( i18n("Remote") ); //Remote path
- CSwordSetupInstallSourcesDialog::CSwordSetupInstallSourcesDialog(/*TQWidget *tqparent*/)
+ CSwordSetupInstallSourcesDialog::CSwordSetupInstallSourcesDialog(/*TQWidget *parent*/)
: TQDialog() {
TQVBoxLayout* mainLayout = new TQVBoxLayout( this );
diff --git a/bibletime/frontend/cswordsetupmodulelistview.cpp b/bibletime/frontend/cswordsetupmodulelistview.cpp
index babc1af..4091ad1 100644
--- a/bibletime/frontend/cswordsetupmodulelistview.cpp
+++ b/bibletime/frontend/cswordsetupmodulelistview.cpp
@@ -65,8 +65,8 @@ namespace BookshelfManager {
* @short InstallationManager module listviews
* @author Martin Gruner
*/
- CSwordSetupModuleListView::CSwordSetupModuleListView(TQWidget *tqparent, bool is_remote, sword::InstallSource* installSource)
- : KListView(tqparent), m_is_remote( is_remote ) {
+ CSwordSetupModuleListView::CSwordSetupModuleListView(TQWidget *parent, bool is_remote, sword::InstallSource* installSource)
+ : KListView(parent), m_is_remote( is_remote ) {
Q_ASSERT(installSource);
new BookshelfManager::ToolTip(this);
m_backend = installSource ? BTInstallMgr::Tool::backend(installSource) : CPointers::backend();
@@ -151,31 +151,31 @@ namespace BookshelfManager {
void CSwordSetupModuleListView::addModule(CSwordModuleInfo* module, TQString localVersion) {
- TQListViewItem* tqparent = 0;
+ TQListViewItem* parent = 0;
switch ( module->type() ) {
case CSwordModuleInfo::Bible:
- tqparent = m_categoryBible;
+ parent = m_categoryBible;
break;
case CSwordModuleInfo::Commentary:
- tqparent = m_categoryCommentary;
+ parent = m_categoryCommentary;
break;
case CSwordModuleInfo::Lexicon:
- tqparent = m_categoryLexicon;
+ parent = m_categoryLexicon;
break;
case CSwordModuleInfo::GenericBook:
- tqparent = m_categoryBook;
+ parent = m_categoryBook;
break;
default:
- tqparent = 0;
+ parent = 0;
break;
}
//handling for special module types
- if ((tqparent == m_categoryLexicon) && (module->category() == CSwordModuleInfo::Glossary)) {
- tqparent = m_categoryGlossaries;
+ if ((parent == m_categoryLexicon) && (module->category() == CSwordModuleInfo::Glossary)) {
+ parent = m_categoryGlossaries;
}
- if ((tqparent == m_categoryLexicon) && (module->category() == CSwordModuleInfo::DailyDevotional)) {
- tqparent = m_categoryDevotionals;
+ if ((parent == m_categoryLexicon) && (module->category() == CSwordModuleInfo::DailyDevotional)) {
+ parent = m_categoryDevotionals;
}
//now we know the category, find the right language group in that category
@@ -186,8 +186,8 @@ namespace BookshelfManager {
}
TQListViewItem * langFolder = 0;
- if (tqparent) {
- langFolder = tqparent->firstChild();
+ if (parent) {
+ langFolder = parent->firstChild();
while( langFolder ) { //try to find language folder if it exsists
if (langFolder->text(0) == langName) { //found right folder
@@ -199,7 +199,7 @@ namespace BookshelfManager {
}
if (!langFolder) { //not yet there
- langFolder = new TQCheckListItem(tqparent, langName, TQCheckListItem::CheckBoxController);
+ langFolder = new TQCheckListItem(parent, langName, TQCheckListItem::CheckBoxController);
langFolder->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
langFolder->setOpen(false);
diff --git a/bibletime/frontend/cswordsetupmodulelistview.h b/bibletime/frontend/cswordsetupmodulelistview.h
index f88775c..7de4149 100644
--- a/bibletime/frontend/cswordsetupmodulelistview.h
+++ b/bibletime/frontend/cswordsetupmodulelistview.h
@@ -32,7 +32,7 @@ class CSwordSetupModuleListView : public KListView {
TQ_OBJECT
public:
- CSwordSetupModuleListView(TQWidget* tqparent, bool is_remote, sword::InstallSource* installSource = 0);
+ CSwordSetupModuleListView(TQWidget* parent, bool is_remote, sword::InstallSource* installSource = 0);
virtual ~CSwordSetupModuleListView();
void addModule(CSwordModuleInfo *, TQString localVersion);
diff --git a/bibletime/frontend/display/cdisplay.cpp b/bibletime/frontend/display/cdisplay.cpp
index 45ccb1f..bc3aad9 100644
--- a/bibletime/frontend/display/cdisplay.cpp
+++ b/bibletime/frontend/display/cdisplay.cpp
@@ -112,23 +112,23 @@ void CDisplayConnections::openFindTextDialog() {
/*----------------------*/
-CReadDisplay* CDisplay::createReadInstance( CReadWindow* readWindow, TQWidget* tqparent ) {
- return new CHTMLReadDisplay(readWindow, tqparent);
+CReadDisplay* CDisplay::createReadInstance( CReadWindow* readWindow, TQWidget* parent ) {
+ return new CHTMLReadDisplay(readWindow, parent);
}
-CWriteDisplay* CDisplay::createWriteInstance( CWriteWindow* writeWindow, const CWriteDisplay::WriteDisplayType& type, TQWidget* tqparent ) {
+CWriteDisplay* CDisplay::createWriteInstance( CWriteWindow* writeWindow, const CWriteDisplay::WriteDisplayType& type, TQWidget* parent ) {
// qWarning("CDisplay::createWriteInstance");
if (type == PlainTextDisplay) {
- return new CPlainWriteDisplay(writeWindow, tqparent);
+ return new CPlainWriteDisplay(writeWindow, parent);
}
else {
- return new CHTMLWriteDisplay(writeWindow, tqparent);
+ return new CHTMLWriteDisplay(writeWindow, parent);
};
}
-CDisplay::CDisplay(CDisplayWindow* tqparent) :
-m_parentWindow(tqparent),
+CDisplay::CDisplay(CDisplayWindow* parent) :
+m_parentWindow(parent),
m_connections( new CDisplayConnections( this ) ),
m_popup(0) {}
diff --git a/bibletime/frontend/display/cdisplay.h b/bibletime/frontend/display/cdisplay.h
index 8042c01..1b394ce 100644
--- a/bibletime/frontend/display/cdisplay.h
+++ b/bibletime/frontend/display/cdisplay.h
@@ -43,8 +43,8 @@ public:
PlainTextDisplay
};
- static CReadDisplay* createReadInstance(CReadWindow* readWindow, TQWidget* tqparent = 0);
- static CWriteDisplay* createWriteInstance( CWriteWindow* writeWindow, const WriteDisplayType& type = PlainTextDisplay, TQWidget* tqparent = 0 );
+ static CReadDisplay* createReadInstance(CReadWindow* readWindow, TQWidget* parent = 0);
+ static CWriteDisplay* createWriteInstance( CWriteWindow* writeWindow, const WriteDisplayType& type = PlainTextDisplay, TQWidget* parent = 0 );
enum TextType {
HTMLText, /* Used for HTML markup */
@@ -94,7 +94,7 @@ public:
*/
virtual CDisplayConnections* const connectionsProxy() const;
/**
- * Returns the tqparent window used for this display widget.
+ * Returns the parent window used for this display widget.
*/
CDisplayWindow* const parentWindow() const;
virtual void print( const CDisplay::TextPart, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) = 0;
@@ -131,7 +131,7 @@ protected:
void emitReferenceClicked( const TQString& reference );
protected:
- CDisplay(CDisplayWindow* tqparent);
+ CDisplay(CDisplayWindow* parent);
virtual ~CDisplay();
private:
@@ -144,7 +144,7 @@ class CDisplayConnections : public TQObject {
Q_OBJECT
TQ_OBJECT
public:
- CDisplayConnections( CDisplay* tqparent );
+ CDisplayConnections( CDisplay* parent );
public slots:
virtual void selectAll();
diff --git a/bibletime/frontend/display/chtmlreaddisplay.cpp b/bibletime/frontend/display/chtmlreaddisplay.cpp
index 3a1b4a8..e549ec2 100644
--- a/bibletime/frontend/display/chtmlreaddisplay.cpp
+++ b/bibletime/frontend/display/chtmlreaddisplay.cpp
@@ -422,7 +422,7 @@ void CHTMLReadDisplay::timerEvent( TQTimerEvent *e ) {
// ---------------------
-CHTMLReadDisplayView::CHTMLReadDisplayView(CHTMLReadDisplay* displayWidget, TQWidget* tqparent) : KHTMLView(displayWidget, tqparent), m_display(displayWidget) {
+CHTMLReadDisplayView::CHTMLReadDisplayView(CHTMLReadDisplay* displayWidget, TQWidget* parent) : KHTMLView(displayWidget, parent), m_display(displayWidget) {
viewport()->setAcceptDrops(true);
setMarginWidth(4);
setMarginHeight(4);
diff --git a/bibletime/frontend/display/chtmlreaddisplay.h b/bibletime/frontend/display/chtmlreaddisplay.h
index de5f4fd..a4ef53d 100644
--- a/bibletime/frontend/display/chtmlreaddisplay.h
+++ b/bibletime/frontend/display/chtmlreaddisplay.h
@@ -61,7 +61,7 @@ public:
protected:
friend class CDisplay;
- CHTMLReadDisplay( CReadWindow* readWindow, TQWidget* tqparent = 0 );
+ CHTMLReadDisplay( CReadWindow* readWindow, TQWidget* parent = 0 );
virtual ~CHTMLReadDisplay();
virtual void urlSelected( const TQString& url, int button, int state, const TQString& _target, KParts::URLArgs args);
@@ -119,7 +119,7 @@ protected: // Protected methods
friend class CHTMLReadDisplay;
- CHTMLReadDisplayView(CHTMLReadDisplay* display, TQWidget* tqparent);
+ CHTMLReadDisplayView(CHTMLReadDisplay* display, TQWidget* parent);
/**
* Reimplementation from TQScrollView. Sets the right slots
*/
diff --git a/bibletime/frontend/display/chtmlwritedisplay.cpp b/bibletime/frontend/display/chtmlwritedisplay.cpp
index 9d20207..73997db 100644
--- a/bibletime/frontend/display/chtmlwritedisplay.cpp
+++ b/bibletime/frontend/display/chtmlwritedisplay.cpp
@@ -27,8 +27,8 @@
#include <kcolorbutton.h>
#include <kpopupmenu.h>
-CHTMLWriteDisplay::CHTMLWriteDisplay(CWriteWindow* parentWindow, TQWidget* tqparent)
-: CPlainWriteDisplay(parentWindow,tqparent) {
+CHTMLWriteDisplay::CHTMLWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent)
+: CPlainWriteDisplay(parentWindow,parent) {
m_actions.bold = 0;
m_actions.italic = 0;
m_actions.underline = 0;
diff --git a/bibletime/frontend/display/chtmlwritedisplay.h b/bibletime/frontend/display/chtmlwritedisplay.h
index b6c7b99..9058e4b 100644
--- a/bibletime/frontend/display/chtmlwritedisplay.h
+++ b/bibletime/frontend/display/chtmlwritedisplay.h
@@ -52,7 +52,7 @@ public:
protected:
friend class CDisplay;
- CHTMLWriteDisplay(CWriteWindow* parentWindow, TQWidget* tqparent);
+ CHTMLWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent);
~CHTMLWriteDisplay();
/**
* Reimplementation to show a popup menu if the right mouse butoon was clicked.
diff --git a/bibletime/frontend/display/cplainwritedisplay.cpp b/bibletime/frontend/display/cplainwritedisplay.cpp
index bfe35c5..012591a 100644
--- a/bibletime/frontend/display/cplainwritedisplay.cpp
+++ b/bibletime/frontend/display/cplainwritedisplay.cpp
@@ -23,7 +23,7 @@
#include <kaction.h>
#include <klocale.h>
-CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* tqparent) : TQTextEdit(parentWindow ? parentWindow : tqparent), CWriteDisplay(parentWindow) {
+CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent) : TQTextEdit(parentWindow ? parentWindow : parent), CWriteDisplay(parentWindow) {
setTextFormat(TQt::PlainText);
setAcceptDrops(true);
viewport()->setAcceptDrops(true);
diff --git a/bibletime/frontend/display/cplainwritedisplay.h b/bibletime/frontend/display/cplainwritedisplay.h
index 67bce0a..897eb85 100644
--- a/bibletime/frontend/display/cplainwritedisplay.h
+++ b/bibletime/frontend/display/cplainwritedisplay.h
@@ -66,7 +66,7 @@ protected:
friend class CDisplay;
friend class CHTMLWriteDisplay;
- CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* tqparent);
+ CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent);
virtual ~CPlainWriteDisplay();
/**
* Reimplementation from TQTextEdit. Provides an popup menu for the given position.
diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
index c4bd315..e78c1d2 100644
--- a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
+++ b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
@@ -40,7 +40,7 @@
using namespace Profile;
-CBibleReadWindow::CBibleReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* tqparent, const char *name ) : CLexiconReadWindow(moduleList, tqparent,name) {
+CBibleReadWindow::CBibleReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name ) : CLexiconReadWindow(moduleList, parent,name) {
}
CBibleReadWindow::~CBibleReadWindow() {}
diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.h b/bibletime/frontend/displaywindow/cbiblereadwindow.h
index b0e67a4..1383225 100644
--- a/bibletime/frontend/displaywindow/cbiblereadwindow.h
+++ b/bibletime/frontend/displaywindow/cbiblereadwindow.h
@@ -35,7 +35,7 @@ class CBibleReadWindow : public CLexiconReadWindow {
Q_OBJECT
TQ_OBJECT
public:
- CBibleReadWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name=0);
+ CBibleReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
virtual ~CBibleReadWindow();
/**
* Store the settings of this window in the given CProfileWindow object.
diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.cpp b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
index 587c1bd..4a2ec07 100644
--- a/bibletime/frontend/displaywindow/cbookreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
@@ -33,7 +33,7 @@
using namespace Profile;
-CBookReadWindow::CBookReadWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name) : CLexiconReadWindow(modules, tqparent, name) {}
+CBookReadWindow::CBookReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name) : CLexiconReadWindow(modules, parent, name) {}
CBookReadWindow::~CBookReadWindow() {}
diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.h b/bibletime/frontend/displaywindow/cbookreadwindow.h
index 81c04a0..1403f9e 100644
--- a/bibletime/frontend/displaywindow/cbookreadwindow.h
+++ b/bibletime/frontend/displaywindow/cbookreadwindow.h
@@ -30,7 +30,7 @@ class CBookReadWindow : public CLexiconReadWindow {
public:
static void insertKeyboardActions( KActionCollection* const a );
- CBookReadWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name=0);
+ CBookReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
virtual ~CBookReadWindow();
/**
diff --git a/bibletime/frontend/displaywindow/cbuttons.cpp b/bibletime/frontend/displaywindow/cbuttons.cpp
index 3965296..f626e25 100644
--- a/bibletime/frontend/displaywindow/cbuttons.cpp
+++ b/bibletime/frontend/displaywindow/cbuttons.cpp
@@ -25,8 +25,8 @@
#include <klocale.h>
-// CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, TQWidget *tqparent, const char *name )
-// : KToolBarButton(CResMgr::displaywindows::transliteration::icon, 0,tqparent,name) {
+// CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, TQWidget *parent, const char *name )
+// : KToolBarButton(CResMgr::displaywindows::transliteration::icon, 0,parent,name) {
// m_filterOptions = filterOptions;
// m_filterOptions->transliteration = 0;
//
@@ -86,8 +86,8 @@
*********** CDisplaySettingsButton *************
************************************************/
-CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *moduleSettings, const ListCSwordModuleInfo& useModules,TQWidget *tqparent, const char *name )
-: KToolBarButton(CResMgr::displaywindows::displaySettings::icon, 0, tqparent, name) {
+CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *moduleSettings, const ListCSwordModuleInfo& useModules,TQWidget *parent, const char *name )
+: KToolBarButton(CResMgr::displaywindows::displaySettings::icon, 0, parent, name) {
// qWarning("CDisplaySettingsButton::CDisplaySettingsButton");
m_displaySettings = displaySettings;
m_moduleSettings = moduleSettings;
diff --git a/bibletime/frontend/displaywindow/cbuttons.h b/bibletime/frontend/displaywindow/cbuttons.h
index 0e6ff14..fb13f18 100644
--- a/bibletime/frontend/displaywindow/cbuttons.h
+++ b/bibletime/frontend/displaywindow/cbuttons.h
@@ -31,7 +31,7 @@ class KPopupMenu;
// Q_OBJECT
// TQ_OBJECT
// public:
-// CTransliterationButton(CSwordBackend::FilterOptions* displayOptions, TQWidget *tqparent, const char *name=0);
+// CTransliterationButton(CSwordBackend::FilterOptions* displayOptions, TQWidget *parent, const char *name=0);
// ~CTransliterationButton();
// /**
// * Setup the menu entries.
@@ -60,7 +60,7 @@ class CDisplaySettingsButton : public KToolBarButton {
Q_OBJECT
TQ_OBJECT
public:
- CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *settings, const ListCSwordModuleInfo& useModules, TQWidget *tqparent=0, const char *name=0);
+ CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *settings, const ListCSwordModuleInfo& useModules, TQWidget *parent=0, const char *name=0);
void reset(const ListCSwordModuleInfo& useModules);
/**
* Sets the item at position pos to the satet given as 2nd paramter.
diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
index 001aafb..46c69f2 100644
--- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
@@ -31,7 +31,7 @@
using namespace Profile;
-CCommentaryReadWindow::CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name) : CLexiconReadWindow(modules, tqparent,name) {}
+CCommentaryReadWindow::CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name) : CLexiconReadWindow(modules, parent,name) {}
void CCommentaryReadWindow::insertKeyboardActions( KActionCollection* const a ) {
new KAction(
diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.h b/bibletime/frontend/displaywindow/ccommentaryreadwindow.h
index ddfaf60..a5a233d 100644
--- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.h
+++ b/bibletime/frontend/displaywindow/ccommentaryreadwindow.h
@@ -31,7 +31,7 @@ public:
*/
static void insertKeyboardActions( KActionCollection* const a );
- CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name=0);
+ CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
/**
* Store the settings of this window in the given CProfileWindow object.
*/
diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
index 3c608db..a0dd45b 100644
--- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp
+++ b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
@@ -48,16 +48,16 @@
using namespace Profile;
-CReadWindow* CDisplayWindow::createReadInstance(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char* name) {
+CReadWindow* CDisplayWindow::createReadInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const char* name) {
switch (modules.first()->type()) {
case CSwordModuleInfo::Bible:
- return new CBibleReadWindow(modules, tqparent, name);
+ return new CBibleReadWindow(modules, parent, name);
case CSwordModuleInfo::Commentary:
- return new CCommentaryReadWindow(modules, tqparent, name);
+ return new CCommentaryReadWindow(modules, parent, name);
case CSwordModuleInfo::Lexicon:
- return new CLexiconReadWindow(modules, tqparent, name);
+ return new CLexiconReadWindow(modules, parent, name);
case CSwordModuleInfo::GenericBook:
- return new CBookReadWindow(modules, tqparent, name);
+ return new CBookReadWindow(modules, parent, name);
default:
qWarning("unknown module type");
break;
@@ -66,23 +66,23 @@ CReadWindow* CDisplayWindow::createReadInstance(ListCSwordModuleInfo modules, CM
}
-CWriteWindow* CDisplayWindow::createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* tqparent, const CDisplayWindow::WriteWindowType type, const char* name) {
+CWriteWindow* CDisplayWindow::createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const CDisplayWindow::WriteWindowType type, const char* name) {
if (type == HTMLWindow) {
- return new CHTMLWriteWindow(modules, tqparent, name);
+ return new CHTMLWriteWindow(modules, parent, name);
}
else {
- return new CPlainWriteWindow(modules, tqparent, name);
+ return new CPlainWriteWindow(modules, parent, name);
}
return 0;
}
-CDisplayWindow::CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea *tqparent, const char *name )
+CDisplayWindow::CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea *parent, const char *name )
#if KDE_VERSION >= 0x030200
-: KMainWindow(KMainWindow::NoDCOPObject, tqparent, name, WDestructiveClose),
+: KMainWindow(KMainWindow::NoDCOPObject, parent, name, WDestructiveClose),
#else
-: KMainWindow(tqparent, name, WDestructiveClose),
+: KMainWindow(parent, name, WDestructiveClose),
#endif
-m_mdi(tqparent),
+m_mdi(parent),
m_filterOptions(),
m_displayOptions(),
m_displaySettingsButton(0),
diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.h b/bibletime/frontend/displaywindow/cdisplaywindow.h
index 5fd3bdd..65ee850 100644
--- a/bibletime/frontend/displaywindow/cdisplaywindow.h
+++ b/bibletime/frontend/displaywindow/cdisplaywindow.h
@@ -58,8 +58,8 @@ public:
PlainTextWindow = 2
};
- static CReadWindow* createReadInstance(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char* name = 0);
- static CWriteWindow* createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* tqparent, const WriteWindowType type = HTMLWindow, const char* name = 0);
+ static CReadWindow* createReadInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const char* name = 0);
+ static CWriteWindow* createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const WriteWindowType type = HTMLWindow, const char* name = 0);
/**
* Insert the keyboard accelerators of this window into the given KAccel object.
*/
@@ -195,7 +195,7 @@ protected:
friend class CMDIArea;
friend class CBibleReadWindow;
- CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name=0);
+ CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
virtual ~CDisplayWindow();
/**
* Initializes the intern keyboard actions.
diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
index d778c9b..e7f778d 100644
--- a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
+++ b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
@@ -25,8 +25,8 @@
using namespace Profile;
-CHTMLWriteWindow::CHTMLWriteWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name)
-: CPlainWriteWindow(modules, tqparent, name) {}
+CHTMLWriteWindow::CHTMLWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name)
+: CPlainWriteWindow(modules, parent, name) {}
CHTMLWriteWindow::~CHTMLWriteWindow() {}
diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.h b/bibletime/frontend/displaywindow/chtmlwritewindow.h
index 642ba61..03b9a8a 100644
--- a/bibletime/frontend/displaywindow/chtmlwritewindow.h
+++ b/bibletime/frontend/displaywindow/chtmlwritewindow.h
@@ -27,7 +27,7 @@ class CHTMLWriteWindow : public CPlainWriteWindow {
Q_OBJECT
TQ_OBJECT
public:
- CHTMLWriteWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name = 0);
+ CHTMLWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name = 0);
virtual ~CHTMLWriteWindow();
/**
diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
index 2b2e864..45c040d 100644
--- a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
@@ -36,7 +36,7 @@
#include <kdeversion.h>
// #include <kactionclasses.h>
-CLexiconReadWindow::CLexiconReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* tqparent, const char *name) : CReadWindow(moduleList, tqparent,name) {
+CLexiconReadWindow::CLexiconReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name) : CReadWindow(moduleList, parent,name) {
setKey( CSwordKey::createInstance(moduleList.first()) );
}
diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.h b/bibletime/frontend/displaywindow/clexiconreadwindow.h
index c06b175..49d79da 100644
--- a/bibletime/frontend/displaywindow/clexiconreadwindow.h
+++ b/bibletime/frontend/displaywindow/clexiconreadwindow.h
@@ -34,7 +34,7 @@ class CLexiconReadWindow : public CReadWindow {
Q_OBJECT
TQ_OBJECT
public:
- CLexiconReadWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name=0);
+ CLexiconReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
virtual ~CLexiconReadWindow();
/**
* Store the settings of this window in the given CProfileWindow object.
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.cpp b/bibletime/frontend/displaywindow/cmodulechooserbar.cpp
index 49ae902..7f0f1fc 100644
--- a/bibletime/frontend/displaywindow/cmodulechooserbar.cpp
+++ b/bibletime/frontend/displaywindow/cmodulechooserbar.cpp
@@ -14,8 +14,8 @@
#include <tqtimer.h>
-CModuleChooserBar::CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, TQWidget *tqparent, const char *name )
-: KToolBar(tqparent,name),
+CModuleChooserBar::CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, TQWidget *parent, const char *name )
+: KToolBar(parent,name),
m_moduleType(type),
m_idCounter(0),
m_buttonLimit(-1) //-1 means no limit
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.h b/bibletime/frontend/displaywindow/cmodulechooserbar.h
index 4598324..bd9e76a 100644
--- a/bibletime/frontend/displaywindow/cmodulechooserbar.h
+++ b/bibletime/frontend/displaywindow/cmodulechooserbar.h
@@ -36,7 +36,7 @@ public:
/**
* Default constructor
*/
- CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, TQWidget *tqparent=0, const char *name=0);
+ CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, TQWidget *parent=0, const char *name=0);
/**
* Returns a list of selected modules.
*/
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
index a2a463e..c982fb6 100644
--- a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
+++ b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
@@ -27,9 +27,9 @@
#include <kglobal.h>
#include <kiconloader.h>
-CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule,CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *tqparent, const char *name )
-: KToolBarButton(iconName(), id, tqparent, name),
-m_id(id), m_popup(0), m_moduleChooserBar(tqparent) {
+CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule,CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *parent, const char *name )
+: KToolBarButton(iconName(), id, parent, name),
+m_id(id), m_popup(0), m_moduleChooserBar(parent) {
m_moduleType = type;
m_module = useModule;
if (!m_module) {
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.h b/bibletime/frontend/displaywindow/cmodulechooserbutton.h
index acc77a8..01ecd24 100644
--- a/bibletime/frontend/displaywindow/cmodulechooserbutton.h
+++ b/bibletime/frontend/displaywindow/cmodulechooserbutton.h
@@ -35,7 +35,7 @@ class CModuleChooserButton : public KToolBarButton, public CPointers {
Q_OBJECT
TQ_OBJECT
public:
- CModuleChooserButton(CSwordModuleInfo* useModule, CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *tqparent, const char *name = 0 );
+ CModuleChooserButton(CSwordModuleInfo* useModule, CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *parent, const char *name = 0 );
~CModuleChooserButton();
CSwordModuleInfo* module();
diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.cpp b/bibletime/frontend/displaywindow/cplainwritewindow.cpp
index 9987223..14cd981 100644
--- a/bibletime/frontend/displaywindow/cplainwritewindow.cpp
+++ b/bibletime/frontend/displaywindow/cplainwritewindow.cpp
@@ -28,7 +28,7 @@
using namespace Profile;
-CPlainWriteWindow::CPlainWriteWindow(ListCSwordModuleInfo moduleList, CMDIArea* tqparent, const char *name ) : CWriteWindow(moduleList, tqparent, name) {
+CPlainWriteWindow::CPlainWriteWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name ) : CWriteWindow(moduleList, parent, name) {
setKey( CSwordKey::createInstance(moduleList.first()) );
}
diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.h b/bibletime/frontend/displaywindow/cplainwritewindow.h
index 6a70404..03780c6 100644
--- a/bibletime/frontend/displaywindow/cplainwritewindow.h
+++ b/bibletime/frontend/displaywindow/cplainwritewindow.h
@@ -29,7 +29,7 @@ class CPlainWriteWindow : public CWriteWindow {
Q_OBJECT
TQ_OBJECT
public:
- CPlainWriteWindow( ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name = 0 );
+ CPlainWriteWindow( ListCSwordModuleInfo modules, CMDIArea* parent, const char *name = 0 );
virtual ~CPlainWriteWindow();
/**
diff --git a/bibletime/frontend/displaywindow/creadwindow.cpp b/bibletime/frontend/displaywindow/creadwindow.cpp
index 6ba128c..35aeec7 100644
--- a/bibletime/frontend/displaywindow/creadwindow.cpp
+++ b/bibletime/frontend/displaywindow/creadwindow.cpp
@@ -35,8 +35,8 @@
using namespace Profile;
-CReadWindow::CReadWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name )
-: CDisplayWindow(modules,tqparent,name),
+CReadWindow::CReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name )
+: CDisplayWindow(modules,parent,name),
m_displayWidget(0) {
// installEventFilter(this);
diff --git a/bibletime/frontend/displaywindow/creadwindow.h b/bibletime/frontend/displaywindow/creadwindow.h
index 72c2ca9..a99ae7b 100644
--- a/bibletime/frontend/displaywindow/creadwindow.h
+++ b/bibletime/frontend/displaywindow/creadwindow.h
@@ -35,7 +35,7 @@ public:
// static void insertKeyboardActions( KAccel* const a );
static void insertKeyboardActions( KActionCollection* const a );
- CReadWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name=0);
+ CReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
virtual ~CReadWindow();
/**
* Store the settings of this window in the given CProfileWindow object.
diff --git a/bibletime/frontend/displaywindow/cwritewindow.cpp b/bibletime/frontend/displaywindow/cwritewindow.cpp
index 9e356d0..6f2262f 100644
--- a/bibletime/frontend/displaywindow/cwritewindow.cpp
+++ b/bibletime/frontend/displaywindow/cwritewindow.cpp
@@ -22,8 +22,8 @@
using namespace Profile;
-CWriteWindow::CWriteWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name )
-: CDisplayWindow(modules, tqparent,name), m_writeDisplay(0) {}
+CWriteWindow::CWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name )
+: CDisplayWindow(modules, parent,name), m_writeDisplay(0) {}
CWriteWindow::~CWriteWindow() {}
diff --git a/bibletime/frontend/displaywindow/cwritewindow.h b/bibletime/frontend/displaywindow/cwritewindow.h
index a74a4f0..0622f5e 100644
--- a/bibletime/frontend/displaywindow/cwritewindow.h
+++ b/bibletime/frontend/displaywindow/cwritewindow.h
@@ -29,7 +29,7 @@ class CWriteWindow : public CDisplayWindow {
public:
static void insertKeyboardActions( KActionCollection* const a );
- CWriteWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name=0);
+ CWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
virtual ~CWriteWindow();
/**
* Store the settings of this window in the given CProfileWindow object.
diff --git a/bibletime/frontend/keychooser/cbiblekeychooser.cpp b/bibletime/frontend/keychooser/cbiblekeychooser.cpp
index f25135b..a728f67 100644
--- a/bibletime/frontend/keychooser/cbiblekeychooser.cpp
+++ b/bibletime/frontend/keychooser/cbiblekeychooser.cpp
@@ -28,8 +28,8 @@
//KDE includes
#include <klocale.h>
-CBibleKeyChooser::CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *tqparent, const char *name )
-: CKeyChooser(modules, key, tqparent, name),
+CBibleKeyChooser::CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent, const char *name )
+: CKeyChooser(modules, key, parent, name),
m_key(dynamic_cast<CSwordVerseKey*>(key)) {
w_ref = 0;
setModules(modules, false);
diff --git a/bibletime/frontend/keychooser/cbiblekeychooser.h b/bibletime/frontend/keychooser/cbiblekeychooser.h
index 7802ab5..9756085 100644
--- a/bibletime/frontend/keychooser/cbiblekeychooser.h
+++ b/bibletime/frontend/keychooser/cbiblekeychooser.h
@@ -39,7 +39,7 @@ public:
* the constructor
* you should not need to use this, use @ref CKeyChooser::createInstance instead
*/
- CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, TQWidget *tqparent=0, const char *name=0);
+ CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, TQWidget *parent=0, const char *name=0);
public slots:
/**
diff --git a/bibletime/frontend/keychooser/cbookkeychooser.cpp b/bibletime/frontend/keychooser/cbookkeychooser.cpp
index a3e2605..04a3a39 100644
--- a/bibletime/frontend/keychooser/cbookkeychooser.cpp
+++ b/bibletime/frontend/keychooser/cbookkeychooser.cpp
@@ -20,8 +20,8 @@
TQMap<TQObject*, int> boxes;
-CBookKeyChooser::CBookKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *tqparent, const char *name)
-: CKeyChooser(modules, key, tqparent,name), m_layout(0) {
+CBookKeyChooser::CBookKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent, const char *name)
+: CKeyChooser(modules, key, parent,name), m_layout(0) {
setModules(modules, false);
m_key = dynamic_cast<CSwordTreeKey*>(key);
diff --git a/bibletime/frontend/keychooser/cbookkeychooser.h b/bibletime/frontend/keychooser/cbookkeychooser.h
index 095904c..3b02090 100644
--- a/bibletime/frontend/keychooser/cbookkeychooser.h
+++ b/bibletime/frontend/keychooser/cbookkeychooser.h
@@ -42,7 +42,7 @@ class CBookKeyChooser : public CKeyChooser {
Q_OBJECT
TQ_OBJECT
public:
- CBookKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, TQWidget *tqparent=0, const char *name=0);
+ CBookKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, TQWidget *parent=0, const char *name=0);
~CBookKeyChooser();
/**
* Refreshes the content.
@@ -75,7 +75,7 @@ public slots: // Public slots
protected: // Protected methods
/**
* Fills the combo given by depth with the items from the key having depth "depth".
- * The tqparent sibling is given by key.
+ * The parent sibling is given by key.
*/
void setupCombo(const TQString key, const int depth, const int currentItem);
/** No descriptions */
diff --git a/bibletime/frontend/keychooser/cbooktreechooser.cpp b/bibletime/frontend/keychooser/cbooktreechooser.cpp
index 8880780..5ac18ae 100644
--- a/bibletime/frontend/keychooser/cbooktreechooser.cpp
+++ b/bibletime/frontend/keychooser/cbooktreechooser.cpp
@@ -25,8 +25,8 @@
////////////
-CBookTreeChooser::TreeItem::TreeItem(TQListViewItem* tqparent, TQListViewItem* after, CSwordTreeKey* key, const TQString keyName)
-: KListViewItem(tqparent, after),
+CBookTreeChooser::TreeItem::TreeItem(TQListViewItem* parent, TQListViewItem* after, CSwordTreeKey* key, const TQString keyName)
+: KListViewItem(parent, after),
m_key(key),
m_keyName(keyName) {
//qDebug("first CBookTreeChooser::TreeItem ctor");
@@ -39,8 +39,8 @@ m_keyName(keyName) {
m_key->setOffset( offset );
};
-CBookTreeChooser::TreeItem::TreeItem(TQListViewItem* tqparent,CSwordTreeKey* key, const TQString keyName)
-: KListViewItem(tqparent),
+CBookTreeChooser::TreeItem::TreeItem(TQListViewItem* parent,CSwordTreeKey* key, const TQString keyName)
+: KListViewItem(parent),
m_key(key),
m_keyName(keyName) {
//qDebug("second CBookTreeChooser::TreeItem ctor");
@@ -124,8 +124,8 @@ void CBookTreeChooser::TreeItem::setOpen(bool o) {
//////////////////////////////////
-CBookTreeChooser::CBookTreeChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *tqparent, const char *name)
-: CKeyChooser(modules, key, tqparent,name),
+CBookTreeChooser::CBookTreeChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent, const char *name)
+: CKeyChooser(modules, key, parent,name),
m_key( dynamic_cast<CSwordTreeKey*>(key) ) {
setModules(modules, false);
@@ -177,7 +177,7 @@ void CBookTreeChooser::setKey(CSwordKey* newKey, const bool emitSignal) {
TQListViewItem* child = m_treeView->firstChild();
while( child && index < count ) {
- if (child->text(0) == currentSibling) { //found a tqparent of our item
+ if (child->text(0) == currentSibling) { //found a parent of our item
//found right entry?
TreeItem* i = dynamic_cast<TreeItem*>(child);
if (!i || i->key() == key) {
diff --git a/bibletime/frontend/keychooser/cbooktreechooser.h b/bibletime/frontend/keychooser/cbooktreechooser.h
index 022e0b7..d9c81e1 100644
--- a/bibletime/frontend/keychooser/cbooktreechooser.h
+++ b/bibletime/frontend/keychooser/cbooktreechooser.h
@@ -47,7 +47,7 @@ class CBookTreeChooser : public CKeyChooser {
Q_OBJECT
TQ_OBJECT
public:
- CBookTreeChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, TQWidget *tqparent=0, const char *name=0);
+ CBookTreeChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, TQWidget *parent=0, const char *name=0);
~CBookTreeChooser();
/**
* Refreshes the content.
@@ -88,8 +88,8 @@ protected slots: // Protected slots
private:
class TreeItem : public KListViewItem {
public:
- TreeItem(TQListViewItem* tqparent, TQListViewItem* after, CSwordTreeKey* key, const TQString keyName);
- TreeItem(TQListViewItem* tqparent, CSwordTreeKey* key, const TQString keyName);
+ TreeItem(TQListViewItem* parent, TQListViewItem* after, CSwordTreeKey* key, const TQString keyName);
+ TreeItem(TQListViewItem* parent, CSwordTreeKey* key, const TQString keyName);
TreeItem(TQListView* view,TQListViewItem* after, CSwordTreeKey* key, const TQString keyName);
const TQString& key() const;
void createChilds();
diff --git a/bibletime/frontend/keychooser/ckeychooser.cpp b/bibletime/frontend/keychooser/ckeychooser.cpp
index a28336f..0db5911 100644
--- a/bibletime/frontend/keychooser/ckeychooser.cpp
+++ b/bibletime/frontend/keychooser/ckeychooser.cpp
@@ -19,13 +19,13 @@
#include "cbiblekeychooser.h"
#include "cbookkeychooser.h"
-CKeyChooser::CKeyChooser(ListCSwordModuleInfo, CSwordKey *, TQWidget *tqparent, const char *name )
-: TQWidget(tqparent, name),
+CKeyChooser::CKeyChooser(ListCSwordModuleInfo, CSwordKey *, TQWidget *parent, const char *name )
+: TQWidget(parent, name),
m_inHistoryFunction(false) {}
CKeyChooser::~CKeyChooser() {}
-CKeyChooser* CKeyChooser::createInstance(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *tqparent) {
+CKeyChooser* CKeyChooser::createInstance(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent) {
if (!modules.count()) {
return 0;
}
@@ -34,13 +34,13 @@ CKeyChooser* CKeyChooser::createInstance(ListCSwordModuleInfo modules, CSwordKey
switch ( modules.first()->type() ) {
case CSwordModuleInfo::Commentary: //Bibles and commentaries uise the same key chooser
case CSwordModuleInfo::Bible:
- ck = new CBibleKeyChooser(modules,key,tqparent);
+ ck = new CBibleKeyChooser(modules,key,parent);
break;
case CSwordModuleInfo::Lexicon:
- ck = new CLexiconKeyChooser(modules,key,tqparent);
+ ck = new CLexiconKeyChooser(modules,key,parent);
break;
case CSwordModuleInfo::GenericBook:
- ck = new CBookKeyChooser(modules,key,tqparent);
+ ck = new CBookKeyChooser(modules,key,parent);
break;
default:
return 0;
diff --git a/bibletime/frontend/keychooser/ckeychooser.h b/bibletime/frontend/keychooser/ckeychooser.h
index 1fca44a..49fffb2 100644
--- a/bibletime/frontend/keychooser/ckeychooser.h
+++ b/bibletime/frontend/keychooser/ckeychooser.h
@@ -40,9 +40,9 @@ public:
* @ref CBibleKeyChooser
* @param info the @ref CModuleInfo to be represented by the KeyChooser
* @param key if not NULL, the @ref CKey the KeyChooser should be set to
- * @param tqparent the tqparent of the widget to create
+ * @param parent the parent of the widget to create
*/
- static CKeyChooser* createInstance(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *tqparent);
+ static CKeyChooser* createInstance(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent);
const TQStringList getPreviousKeys() const;
const TQStringList getNextKeys() const;
@@ -98,7 +98,7 @@ protected:
/**
* the constructor - DO NOT USE! -- use @ref #createInstance instead!
*/
- CKeyChooser(ListCSwordModuleInfo info, CSwordKey *key=0, TQWidget *tqparent=0, const char *name=0);
+ CKeyChooser(ListCSwordModuleInfo info, CSwordKey *key=0, TQWidget *parent=0, const char *name=0);
virtual ~CKeyChooser();
/**
* Set the appropriate font do display the modules
diff --git a/bibletime/frontend/keychooser/ckeychooserwidget.cpp b/bibletime/frontend/keychooser/ckeychooserwidget.cpp
index 4c25c1c..01a7b37 100644
--- a/bibletime/frontend/keychooser/ckeychooserwidget.cpp
+++ b/bibletime/frontend/keychooser/ckeychooserwidget.cpp
@@ -30,8 +30,8 @@
#include <tqtooltip.h>
#include <tqrect.h>
-CKCComboBox::CKCComboBox(bool rw,TQWidget* tqparent,const char* name)
-: TQComboBox(rw,tqparent,name) {
+CKCComboBox::CKCComboBox(bool rw,TQWidget* parent,const char* name)
+: TQComboBox(rw,parent,name) {
setFocusPolicy(TQ_WheelFocus);
if (lineEdit()) {
installEventFilter( lineEdit() );
@@ -92,7 +92,7 @@ void CKCComboBox::wheelEvent( TQWheelEvent* e ) {
//**********************************************************************************/
-CKeyChooserWidget::CKeyChooserWidget(int count, const bool useNextPrevSignals, TQWidget *tqparent, const char *name) : TQWidget(tqparent,name) {
+CKeyChooserWidget::CKeyChooserWidget(int count, const bool useNextPrevSignals, TQWidget *parent, const char *name) : TQWidget(parent,name) {
m_useNextPrevSignals = useNextPrevSignals;
for (int index=1; index <= count; index++) {
@@ -102,7 +102,7 @@ CKeyChooserWidget::CKeyChooserWidget(int count, const bool useNextPrevSignals,
reset(m_list,0,false);
};
-CKeyChooserWidget::CKeyChooserWidget(TQStringList *list, const bool useNextPrevSignals, TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) {
+CKeyChooserWidget::CKeyChooserWidget(TQStringList *list, const bool useNextPrevSignals, TQWidget *parent, const char *name ) : TQWidget(parent,name) {
m_useNextPrevSignals = useNextPrevSignals;
if (list) {
diff --git a/bibletime/frontend/keychooser/ckeychooserwidget.h b/bibletime/frontend/keychooser/ckeychooserwidget.h
index 35f3f55..4c14381 100644
--- a/bibletime/frontend/keychooser/ckeychooserwidget.h
+++ b/bibletime/frontend/keychooser/ckeychooserwidget.h
@@ -40,7 +40,7 @@ class CKCComboBox : public TQComboBox {
TQ_OBJECT
public:
- CKCComboBox(bool rw, TQWidget * tqparent=0, const char * name=0 );
+ CKCComboBox(bool rw, TQWidget * parent=0, const char * name=0 );
/**
* Returns the size this widget would like to have.
*/
@@ -77,11 +77,11 @@ public:
/**
* the constructor
*/
- CKeyChooserWidget(TQStringList *list=0, const bool useNextPrevSignals = false, TQWidget *tqparent=0, const char *name=0);
+ CKeyChooserWidget(TQStringList *list=0, const bool useNextPrevSignals = false, TQWidget *parent=0, const char *name=0);
/**
* the constructor
*/
- CKeyChooserWidget(int count=0, const bool useNextPrevSignals = false, TQWidget *tqparent=0, const char *name=0);
+ CKeyChooserWidget(int count=0, const bool useNextPrevSignals = false, TQWidget *parent=0, const char *name=0);
/**
* This function does clear the combobox, then fill in
* the StringList, set the ComboBox' current item to index
diff --git a/bibletime/frontend/keychooser/ckeyreferencewidget.cpp b/bibletime/frontend/keychooser/ckeyreferencewidget.cpp
index 8a4f512..13baf97 100644
--- a/bibletime/frontend/keychooser/ckeyreferencewidget.cpp
+++ b/bibletime/frontend/keychooser/ckeyreferencewidget.cpp
@@ -49,7 +49,7 @@ TQString CKeyReferenceCompletion::makeCompletion(const TQString &text) {
//**********************************************************************************/
/* To get popup working we have to rework KLineEdit too */
-CKeyReferenceLineEdit::CKeyReferenceLineEdit(TQWidget *tqparent, const char *name) : KLineEdit(tqparent,name) {
+CKeyReferenceLineEdit::CKeyReferenceLineEdit(TQWidget *parent, const char *name) : KLineEdit(parent,name) {
}
void CKeyReferenceLineEdit::makeCompletion(const TQString &text) {
@@ -80,7 +80,7 @@ void CKeyReferenceLineEdit::makeCompletion(const TQString &text) {
//**********************************************************************************/
-CKeyReferenceWidget::CKeyReferenceWidget( CSwordBibleModuleInfo *mod, CSwordVerseKey *key, TQWidget *tqparent, const char *name) : TQWidget(tqparent,name) {
+CKeyReferenceWidget::CKeyReferenceWidget( CSwordBibleModuleInfo *mod, CSwordVerseKey *key, TQWidget *parent, const char *name) : TQWidget(parent,name) {
updatelock = false;
m_module = mod;
diff --git a/bibletime/frontend/keychooser/ckeyreferencewidget.h b/bibletime/frontend/keychooser/ckeyreferencewidget.h
index 1762add..84eed2e 100644
--- a/bibletime/frontend/keychooser/ckeyreferencewidget.h
+++ b/bibletime/frontend/keychooser/ckeyreferencewidget.h
@@ -40,7 +40,7 @@ class CKeyReferenceLineEdit : public KLineEdit {
Q_OBJECT
TQ_OBJECT
public:
- CKeyReferenceLineEdit(TQWidget *tqparent=0, const char *name=0);
+ CKeyReferenceLineEdit(TQWidget *parent=0, const char *name=0);
void makeCompletion(const TQString &);
};
@@ -51,7 +51,7 @@ public:
/**
* the constructor
*/
- CKeyReferenceWidget(CSwordBibleModuleInfo *, CSwordVerseKey*, TQWidget *tqparent=0, const char *name=0);
+ CKeyReferenceWidget(CSwordBibleModuleInfo *, CSwordVerseKey*, TQWidget *parent=0, const char *name=0);
bool setKey(CSwordVerseKey* key);
KLineEdit* textbox();
void setModule(CSwordBibleModuleInfo *m = 0);
diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.cpp b/bibletime/frontend/keychooser/clexiconkeychooser.cpp
index d09fd5d..4b2f306 100644
--- a/bibletime/frontend/keychooser/clexiconkeychooser.cpp
+++ b/bibletime/frontend/keychooser/clexiconkeychooser.cpp
@@ -31,8 +31,8 @@
//KDE includes
#include <klocale.h>
-CLexiconKeyChooser::CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *tqparent, const char *name )
-: CKeyChooser(modules, key, tqparent, name),
+CLexiconKeyChooser::CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent, const char *name )
+: CKeyChooser(modules, key, parent, name),
m_key(dynamic_cast<CSwordLDKey*>(key)) {
setModules(modules, false);
diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.h b/bibletime/frontend/keychooser/clexiconkeychooser.h
index 1d5780e..2bdb838 100644
--- a/bibletime/frontend/keychooser/clexiconkeychooser.h
+++ b/bibletime/frontend/keychooser/clexiconkeychooser.h
@@ -38,7 +38,7 @@ public:
*
* you should not need to use this, use @ref CKeyChooser::createInstance instead
*/
- CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, TQWidget *tqparent=0, const char *name=0);
+ CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, TQWidget *parent=0, const char *name=0);
public slots:
/**
diff --git a/bibletime/frontend/keychooser/crefselectdialog.cpp b/bibletime/frontend/keychooser/crefselectdialog.cpp
index d3818c0..56c26d7 100644
--- a/bibletime/frontend/keychooser/crefselectdialog.cpp
+++ b/bibletime/frontend/keychooser/crefselectdialog.cpp
@@ -24,8 +24,8 @@
#include <klocale.h>
-//CRefSelectDialog::CRefSelectDialog(TQWidget *tqparent)
-// : KDialogBase(tqparent, "Refenences",
+//CRefSelectDialog::CRefSelectDialog(TQWidget *parent)
+// : KDialogBase(parent, "Refenences",
// true, i18n("Refenence selector"),
// KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true),
// m_oldPos(0,0)
@@ -77,12 +77,12 @@
// key->key(m_lineedit->text());
// m_chooser->setKey(key);
//
-// // restore tqparent of stolen widget
+// // restore parent of stolen widget
// restoreParent();
//}
//
//void CRefSelectDialog::slotPressedCancel() {
-// // restore tqparent of stolen widget
+// // restore parent of stolen widget
// restoreParent();
//}
//
diff --git a/bibletime/frontend/keychooser/crefselectdialog.h b/bibletime/frontend/keychooser/crefselectdialog.h
index 65fc4f3..73a1411 100644
--- a/bibletime/frontend/keychooser/crefselectdialog.h
+++ b/bibletime/frontend/keychooser/crefselectdialog.h
@@ -28,7 +28,7 @@ class TQLineEdit;
// Q_OBJECT
TQ_OBJECT
// public:
-// CRefSelectDialog(TQWidget *tqparent);
+// CRefSelectDialog(TQWidget *parent);
// virtual ~CRefSelectDialog();
//
// void setChooser(CKeyChooser* const chooser);
diff --git a/bibletime/frontend/keychooser/cscrollbutton.cpp b/bibletime/frontend/keychooser/cscrollbutton.cpp
index d9edec6..3f7042f 100644
--- a/bibletime/frontend/keychooser/cscrollbutton.cpp
+++ b/bibletime/frontend/keychooser/cscrollbutton.cpp
@@ -21,7 +21,7 @@
#include <tqapplication.h>
#include <tqcursor.h>
-CScrollButton::CScrollButton(TQWidget *tqparent, const char *name ) : TQToolButton(tqparent,name) {
+CScrollButton::CScrollButton(TQWidget *parent, const char *name ) : TQToolButton(parent,name) {
setFocusPolicy(TQ_WheelFocus);
setCursor( splitVCursor );
diff --git a/bibletime/frontend/keychooser/cscrollbutton.h b/bibletime/frontend/keychooser/cscrollbutton.h
index 499346a..8eeb234 100644
--- a/bibletime/frontend/keychooser/cscrollbutton.h
+++ b/bibletime/frontend/keychooser/cscrollbutton.h
@@ -27,7 +27,7 @@ public:
/**
* The constructor
*/
- CScrollButton(TQWidget *tqparent=0, const char *name=0);
+ CScrollButton(TQWidget *parent=0, const char *name=0);
const bool isLocked() const;
signals:
diff --git a/bibletime/frontend/keychooser/cscrollerwidgetset.cpp b/bibletime/frontend/keychooser/cscrollerwidgetset.cpp
index c0fb353..5054a6b 100644
--- a/bibletime/frontend/keychooser/cscrollerwidgetset.cpp
+++ b/bibletime/frontend/keychooser/cscrollerwidgetset.cpp
@@ -35,7 +35,7 @@ const unsigned int WIDTH = 16;
const unsigned int ARROW_HEIGHT = 12;
const unsigned int MOVER_HEIGHT = 6;
-CScrollerWidgetSet::CScrollerWidgetSet(TQWidget *tqparent, const char *name) : TQWidget(tqparent,name) {
+CScrollerWidgetSet::CScrollerWidgetSet(TQWidget *parent, const char *name) : TQWidget(parent,name) {
m_layout = new TQVBoxLayout(this);
m_layout->tqsetAlignment(TQt::AlignHCenter | TQt::AlignCenter);
diff --git a/bibletime/frontend/keychooser/cscrollerwidgetset.h b/bibletime/frontend/keychooser/cscrollerwidgetset.h
index 6d8fcf5..75d710a 100644
--- a/bibletime/frontend/keychooser/cscrollerwidgetset.h
+++ b/bibletime/frontend/keychooser/cscrollerwidgetset.h
@@ -34,7 +34,7 @@ public:
/**
* the constructor
*/
- CScrollerWidgetSet(TQWidget *tqparent=0, const char *name=0);
+ CScrollerWidgetSet(TQWidget *parent=0, const char *name=0);
/**
* Sets the tooltips for the given entries using the parameters as text.
*/
diff --git a/bibletime/frontend/mainindex/cindexitem.cpp b/bibletime/frontend/mainindex/cindexitem.cpp
index e690d06..aa50f8d 100644
--- a/bibletime/frontend/mainindex/cindexitem.cpp
+++ b/bibletime/frontend/mainindex/cindexitem.cpp
@@ -87,7 +87,7 @@ void CItemBase::moveAfter( CItemBase* const item ) {
if (!item)
return;
- if ( tqparent() == item->tqparent() ) { //same tqparent means level
+ if ( parent() == item->parent() ) { //same parent means level
moveItem(item); //both items are on the same level, so we can use moveItem
}
}
@@ -510,7 +510,7 @@ TQPtrList<TQListViewItem> CFolderBase::getChildList() {
return childs;
TQListViewItem* i = firstChild();
- while (i && (i->tqparent() == this)) {
+ while (i && (i->parent() == this)) {
CItemBase* item = dynamic_cast<CItemBase*>(i);
if (item) { //we found a valid item
childs.append(item);
@@ -527,7 +527,7 @@ TQPtrList<TQListViewItem> CFolderBase::getChildList() {
do {
i = i->nextSibling();
}
- while (i && (i->tqparent() != this));
+ while (i && (i->parent() != this));
}
return childs;
@@ -714,8 +714,8 @@ namespace Bookmarks {
content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION);
doc.appendChild(content);
- //first create the bookmark groups in the XML document, then add the bookmarks to each tqparent
- TQMap<int, TQDomElement> parentMap; //maps tqparent ids to dom elements
+ //first create the bookmark groups in the XML document, then add the bookmarks to each parent
+ TQMap<int, TQDomElement> parentMap; //maps parent ids to dom elements
TQStringList groupList = config->readListEntry("Groups");
@@ -810,7 +810,7 @@ OldBookmarksFolder::OldBookmarksFolder(CTreeFolder* folder) : CBookmarkFolder(fo
// Append the XML nodes of all child items
CItemBase* i = dynamic_cast<CItemBase*>(firstChild());
while( i ) {
- if (i->tqparent() == this) {
+ if (i->parent() == this) {
TQDomElement newElem = i->saveToXML( doc );
if (!newElem.isNull()) {
elem.appendChild( newElem ); //append to this folder
@@ -892,7 +892,7 @@ SubFolder::SubFolder(CFolderBase* parentItem, TQDomElement& xml ) : CBookmarkFol
//append the XML nodes of all child items
CItemBase* i = dynamic_cast<CItemBase*>(firstChild());
while( i ) {
- if (i->tqparent() == this) {
+ if (i->parent() == this) {
TQDomElement newElem = i->saveToXML( doc );
if (!newElem.isNull()) {
elem.appendChild( newElem ); //append to this folder
@@ -1035,7 +1035,7 @@ const bool CBookmarkFolder::saveBookmarks( const TQString& filename, const bool&
//append the XML nodes of all child items
CItemBase* i = dynamic_cast<CItemBase*>( firstChild() );
while( i ) {
- if (i->tqparent() == this) { //only one level under this folder
+ if (i->parent() == this) { //only one level under this folder
TQDomElement newElem = i->saveToXML( doc ); // the cild creates it's own XML code
if (!newElem.isNull()) {
content.appendChild( newElem ); //append to this folder
diff --git a/bibletime/frontend/mainindex/cmainindex.cpp b/bibletime/frontend/mainindex/cmainindex.cpp
index d5527ec..81b3405 100644
--- a/bibletime/frontend/mainindex/cmainindex.cpp
+++ b/bibletime/frontend/mainindex/cmainindex.cpp
@@ -42,7 +42,7 @@
using namespace Printing;
-CMainIndex::ToolTip::ToolTip(CMainIndex* tqparent) : TQToolTip(tqparent->viewport()), m_mainIndex(tqparent) {}
+CMainIndex::ToolTip::ToolTip(CMainIndex* parent) : TQToolTip(parent->viewport()), m_mainIndex(parent) {}
void CMainIndex::ToolTip::maybeTip(const TQPoint& p) {
CItemBase* i = dynamic_cast<CItemBase*>(m_mainIndex->itemAt(p));
@@ -77,7 +77,7 @@ void CMainIndex::ToolTip::maybeTip(const TQPoint& p) {
}
}
-CMainIndex::CMainIndex(TQWidget *tqparent) : KListView(tqparent),
+CMainIndex::CMainIndex(TQWidget *parent) : KListView(parent),
m_searchDialog(0), m_toolTip(0), m_itemsMovable(false), m_autoOpenFolder(0), m_autoOpenTimer(this) {
initView();
initConnections();
@@ -272,9 +272,9 @@ void CMainIndex::initTree() {
}
/** No descriptions */
-void CMainIndex::dropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after) {
+void CMainIndex::dropped( TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after) {
Q_ASSERT(after);
- Q_ASSERT(tqparent);
+ Q_ASSERT(parent);
//the drop was started in this main index widget
if (m_itemsMovable && ((e->source()) == (viewport()))) {
@@ -283,7 +283,7 @@ void CMainIndex::dropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewIt
* folder or one of its subfolders
* we remove the current items because the new ones will be inserted soon.
*/
- if (dynamic_cast<CBookmarkFolder*>(tqparent) || dynamic_cast<Bookmarks::SubFolder*>(tqparent)) {
+ if (dynamic_cast<CBookmarkFolder*>(parent) || dynamic_cast<Bookmarks::SubFolder*>(parent)) {
// we drop onto the bookmark folder or one of it's subfolders
// TQPtrList<TQListViewItem> items = selectedItems();
// items.setAutoDelete(true);
@@ -292,7 +292,7 @@ void CMainIndex::dropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewIt
}
//finally do the drop, either with external drop data or with the moved items' data
- CItemBase* const parentItem = dynamic_cast<CItemBase*>(tqparent);
+ CItemBase* const parentItem = dynamic_cast<CItemBase*>(parent);
CItemBase* const afterItem = dynamic_cast<CItemBase*>(after);
bool removeSelectedItems = true;
@@ -323,14 +323,14 @@ void CMainIndex::dropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewIt
if (afterItem->acceptDrop(e)) {
afterItem->dropped(e, after);
}
- else { //insert in the tqparent folder and then move the inserted items
+ else { //insert in the parent folder and then move the inserted items
parentItem->dropped(e, after);
}
}
parentItem->setOpen(true);
}
- else if (parentItem) { //no after item present, but a tqparent is there
+ else if (parentItem) { //no after item present, but a parent is there
moveSelectedItems = false;
removeSelectedItems = false;
@@ -762,7 +762,7 @@ void CMainIndex::readSettings() {
TQStringList openGroups = CBTConfig::get(CBTConfig::bookshelfOpenGroups);
for (TQStringList::Iterator it( openGroups.begin() ); it != openGroups.end(); ++it) {
- TQStringList path = TQStringList::split("/", (*it)); //e.g. with items tqparent, child
+ TQStringList path = TQStringList::split("/", (*it)); //e.g. with items parent, child
TQListViewItem* item = firstChild(); //begin on the top for each item
Q_ASSERT(item);
unsigned int index = 1;
@@ -833,9 +833,9 @@ void CMainIndex::saveSettings() {
//it.current()'s full name needs to be added to the list
TQListViewItem* i = it.current();
TQString fullName = i->text(0);
- while (i->tqparent()) {
- i = i->tqparent();
- fullName.prepend("/").prepend( i->text(0).replace("/", "\\/")); // tqparent / child
+ while (i->parent()) {
+ i = i->parent();
+ fullName.prepend("/").prepend( i->text(0).replace("/", "\\/")); // parent / child
}
openGroups << fullName;
}
@@ -856,7 +856,7 @@ void CMainIndex::saveSettings() {
TQString path;
while (item) {
path.prepend( item->text(0) + "/" );
- item = item->tqparent();
+ item = item->parent();
}
CBTConfig::set(CBTConfig::bookshelfCurrentItem, path);
}
diff --git a/bibletime/frontend/mainindex/cmainindex.h b/bibletime/frontend/mainindex/cmainindex.h
index 8422ff6..5c2d62d 100644
--- a/bibletime/frontend/mainindex/cmainindex.h
+++ b/bibletime/frontend/mainindex/cmainindex.h
@@ -40,7 +40,7 @@ class CMainIndex : public KListView {
class ToolTip : public TQToolTip {
public:
- ToolTip(CMainIndex* tqparent);
+ ToolTip(CMainIndex* parent);
virtual ~ToolTip() {}
/**
* Displays a tooltip for position p using the getToolTip() function of CGroupManagerItem
@@ -52,7 +52,7 @@ class CMainIndex : public KListView {
};
public:
- CMainIndex(TQWidget *tqparent);
+ CMainIndex(TQWidget *parent);
virtual ~CMainIndex();
void initTree();
diff --git a/bibletime/frontend/manageindicesform.cpp b/bibletime/frontend/manageindicesform.cpp
index 1be9052..dca1a9f 100644
--- a/bibletime/frontend/manageindicesform.cpp
+++ b/bibletime/frontend/manageindicesform.cpp
@@ -21,11 +21,11 @@
#include <tqwhatsthis.h>
/*
- * Constructs a ManageIndicesForm as a child of 'tqparent', with the
+ * Constructs a ManageIndicesForm as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-ManageIndicesForm::ManageIndicesForm( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+ManageIndicesForm::ManageIndicesForm( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
if ( !name )
setName( "ManageIndicesForm" );
diff --git a/bibletime/frontend/searchdialog/cmodulechooser.cpp b/bibletime/frontend/searchdialog/cmodulechooser.cpp
index d6c3ae9..b31a363 100644
--- a/bibletime/frontend/searchdialog/cmodulechooser.cpp
+++ b/bibletime/frontend/searchdialog/cmodulechooser.cpp
@@ -66,7 +66,7 @@ CSwordModuleInfo* const CModuleChooser::ModuleCheckBoxItem::module() const {
/****************************/
/****************************/
-CModuleChooser::CModuleChooser(TQWidget* tqparent) : KListView(tqparent) {
+CModuleChooser::CModuleChooser(TQWidget* parent) : KListView(parent) {
initView();
initTree();
}
diff --git a/bibletime/frontend/searchdialog/cmodulechooser.h b/bibletime/frontend/searchdialog/cmodulechooser.h
index 06b5e41..06b20f2 100644
--- a/bibletime/frontend/searchdialog/cmodulechooser.h
+++ b/bibletime/frontend/searchdialog/cmodulechooser.h
@@ -54,7 +54,7 @@ public:
CSwordModuleInfo* m_module;
};
- CModuleChooser(TQWidget* tqparent);
+ CModuleChooser(TQWidget* parent);
~CModuleChooser();
/**
* Sets the list of modules and updates the state of the checkbox items.
diff --git a/bibletime/frontend/searchdialog/cmoduleresultview.cpp b/bibletime/frontend/searchdialog/cmoduleresultview.cpp
index af564cf..a562291 100644
--- a/bibletime/frontend/searchdialog/cmoduleresultview.cpp
+++ b/bibletime/frontend/searchdialog/cmoduleresultview.cpp
@@ -34,8 +34,8 @@ namespace Search {
************ ModuleResultList **************
********************************************/
-CModuleResultView::CModuleResultView(TQWidget* tqparent, const char* name) :
- KListView(tqparent, name) {
+CModuleResultView::CModuleResultView(TQWidget* parent, const char* name) :
+ KListView(parent, name) {
initView();
initConnections();
strongsResults = 0;
@@ -150,7 +150,7 @@ void CModuleResultView::setupTree( ListCSwordModuleInfo modules, const TQString&
executed(currentItem());
}
-void CModuleResultView::setupStrongsResults(CSwordModuleInfo* module, TQListViewItem* tqparent,
+void CModuleResultView::setupStrongsResults(CSwordModuleInfo* module, TQListViewItem* parent,
const TQString& sNumber) {
TQString lText;
util::CSortListViewItem* item = 0;
@@ -160,7 +160,7 @@ void CModuleResultView::setupStrongsResults(CSwordModuleInfo* module, TQListView
for (int cnt = 0; cnt < strongsResults->Count(); ++cnt) {
lText = strongsResults->keyText(cnt);
- item = new util::CSortListViewItem(tqparent, lText, TQString::number(strongsResults->keyCount(cnt)));
+ item = new util::CSortListViewItem(parent, lText, TQString::number(strongsResults->keyCount(cnt)));
item->setColumnSorting(1, util::CSortListViewItem::Number);
}
}
@@ -201,10 +201,10 @@ CSwordModuleInfo* const CModuleResultView::activeModule() {
return 0;
}
- // we need to find the tqparent most node because that is the node
+ // we need to find the parent most node because that is the node
// that is the module name.
- while (item->tqparent()) {
- item = item->tqparent();
+ while (item->parent()) {
+ item = item->parent();
}
if (item) {
diff --git a/bibletime/frontend/searchdialog/cmoduleresultview.h b/bibletime/frontend/searchdialog/cmoduleresultview.h
index df7422a..056f394 100644
--- a/bibletime/frontend/searchdialog/cmoduleresultview.h
+++ b/bibletime/frontend/searchdialog/cmoduleresultview.h
@@ -43,7 +43,7 @@ class CModuleResultView : public KListView {
Q_OBJECT
TQ_OBJECT
public:
- CModuleResultView(TQWidget* tqparent, const char* name = 0);
+ CModuleResultView(TQWidget* parent, const char* name = 0);
~CModuleResultView();
/**
@@ -65,7 +65,7 @@ protected: // Protected methods
*/
void initConnections();
- void setupStrongsResults(CSwordModuleInfo* module, TQListViewItem* tqparent, const TQString& searchedText);
+ void setupStrongsResults(CSwordModuleInfo* module, TQListViewItem* parent, const TQString& searchedText);
protected slots: // Protected slots
/**
diff --git a/bibletime/frontend/searchdialog/csearchanalysis.cpp b/bibletime/frontend/searchdialog/csearchanalysis.cpp
index 6e2e40b..09ed612 100644
--- a/bibletime/frontend/searchdialog/csearchanalysis.cpp
+++ b/bibletime/frontend/searchdialog/csearchanalysis.cpp
@@ -104,8 +104,8 @@ void CSearchAnalysisDialog::initConnections() {}
/* CSearchAnalysis */
/****************************/
-CSearchAnalysis::CSearchAnalysis(TQObject *tqparent, const char *name )
-: TQCanvas(tqparent,name) {
+CSearchAnalysis::CSearchAnalysis(TQObject *parent, const char *name )
+: TQCanvas(parent,name) {
m_scaleFactor = 0.0;
m_legend = 0;
@@ -290,8 +290,8 @@ const unsigned int CSearchAnalysis::getCount( const TQString book, CSwordModuleI
//------------------------------------------------------------------
//------------------------------------------------------------------
-CSearchAnalysisItem::CSearchAnalysisItem(TQCanvas *tqparent, const int moduleCount, const TQString &bookname, double *scaleFactor, ListCSwordModuleInfo* modules)
-: TQCanvasRectangle(tqparent),
+CSearchAnalysisItem::CSearchAnalysisItem(TQCanvas *parent, const int moduleCount, const TQString &bookname, double *scaleFactor, ListCSwordModuleInfo* modules)
+: TQCanvasRectangle(parent),
m_moduleList( modules ),
m_scaleFactor(scaleFactor),
m_bookName(bookname),
@@ -411,8 +411,8 @@ const TQString CSearchAnalysisItem::getToolTip() {
//------------------------------------------------------------------
//------------------------------------------------------------------
-CSearchAnalysisView::CSearchAnalysisView(TQCanvas* canvas, TQWidget* tqparent)
-: TQCanvasView(canvas, tqparent) {
+CSearchAnalysisView::CSearchAnalysisView(TQCanvas* canvas, TQWidget* parent)
+: TQCanvasView(canvas, parent) {
setFocusPolicy(TQ_WheelFocus);
m_toolTip = new ToolTip(this);
resize(tqsizeHint());
@@ -431,7 +431,7 @@ void CSearchAnalysisView::resizeEvent( TQResizeEvent* e) {
canvas()->resize( canvas()->width(), viewport()->height() );
}
-CSearchAnalysisView::ToolTip::ToolTip(TQWidget* tqparent) : TQToolTip(tqparent) {}
+CSearchAnalysisView::ToolTip::ToolTip(TQWidget* parent) : TQToolTip(parent) {}
void CSearchAnalysisView::ToolTip::maybeTip(const TQPoint& p) {
CSearchAnalysisView* view = dynamic_cast<CSearchAnalysisView*>(parentWidget());
@@ -469,8 +469,8 @@ CSearchAnalysisItem* CSearchAnalysisView::itemAt( const TQPoint& p ) {
//------------------------------------------------------------------
//------------------------------------------------------------------
-CSearchAnalysisLegendItem::CSearchAnalysisLegendItem(TQCanvas *tqparent, ListCSwordModuleInfo *list )
-: TQCanvasRectangle(tqparent) {
+CSearchAnalysisLegendItem::CSearchAnalysisLegendItem(TQCanvas *parent, ListCSwordModuleInfo *list )
+: TQCanvasRectangle(parent) {
m_moduleList = list;
}
diff --git a/bibletime/frontend/searchdialog/csearchanalysis.h b/bibletime/frontend/searchdialog/csearchanalysis.h
index 5e24e1a..db734cd 100644
--- a/bibletime/frontend/searchdialog/csearchanalysis.h
+++ b/bibletime/frontend/searchdialog/csearchanalysis.h
@@ -54,7 +54,7 @@ class CSearchAnalysis : public TQCanvas {
Q_OBJECT
TQ_OBJECT
public:
- CSearchAnalysis(TQObject *tqparent=0, const char *name=0);
+ CSearchAnalysis(TQObject *parent=0, const char *name=0);
virtual ~CSearchAnalysis();
/**
* Starts the analysis of the search result.
@@ -135,7 +135,7 @@ public:
/**
* Standard constructor.
*/
- CSearchAnalysisItem(TQCanvas* tqparent, const int moduleCount, const TQString& bookname, double *scaleFactor, ListCSwordModuleInfo* modules);
+ CSearchAnalysisItem(TQCanvas* parent, const int moduleCount, const TQString& bookname, double *scaleFactor, ListCSwordModuleInfo* modules);
virtual ~CSearchAnalysisItem();
/**
* Sets the resultcount of this item
@@ -169,7 +169,7 @@ private:
class CSearchAnalysisLegendItem : public TQCanvasRectangle {
public:
- CSearchAnalysisLegendItem(TQCanvas* tqparent, ListCSwordModuleInfo* list );
+ CSearchAnalysisLegendItem(TQCanvas* parent, ListCSwordModuleInfo* list );
private:
virtual void draw (TQPainter & painter);
@@ -185,10 +185,10 @@ public:
/**
* Standard constructor
*/
- CSearchAnalysisView(TQCanvas* canvas, TQWidget* tqparent);
+ CSearchAnalysisView(TQCanvas* canvas, TQWidget* parent);
/**
* Returns the tqsizeHint for this view
- * We give back the size of the tqparent widgetas default.
+ * We give back the size of the parent widgetas default.
* This is a reimplementation from TQCanvasView::tqsizeHint().
*/
virtual TQSize tqsizeHint();
@@ -207,7 +207,7 @@ protected:
private:
class ToolTip : public TQToolTip {
public:
- ToolTip(TQWidget* tqparent);
+ ToolTip(TQWidget* parent);
virtual ~ToolTip() {}
;
/**
diff --git a/bibletime/frontend/searchdialog/csearchdialog.cpp b/bibletime/frontend/searchdialog/csearchdialog.cpp
index cbf69f6..d4a35ad 100644
--- a/bibletime/frontend/searchdialog/csearchdialog.cpp
+++ b/bibletime/frontend/searchdialog/csearchdialog.cpp
@@ -81,8 +81,8 @@ CSearchDialog* const CSearchDialog::getSearchDialog() {
return m_staticDialog;
};
-CSearchDialog::CSearchDialog(TQWidget *tqparent)
-: KDialogBase(Plain, i18n("Search dialog"), Close | User1, User1, tqparent, "CSearchDialog", false, true, i18n("Search")) {
+CSearchDialog::CSearchDialog(TQWidget *parent)
+: KDialogBase(Plain, i18n("Search dialog"), Close | User1, User1, parent, "CSearchDialog", false, true, i18n("Search")) {
setWFlags( getWFlags() | TQt::WStyle_MinMax );
setIcon(CResMgr::searchdialog::icon);
diff --git a/bibletime/frontend/searchdialog/csearchdialog.h b/bibletime/frontend/searchdialog/csearchdialog.h
index 557ce3f..231fdb2 100644
--- a/bibletime/frontend/searchdialog/csearchdialog.h
+++ b/bibletime/frontend/searchdialog/csearchdialog.h
@@ -65,7 +65,7 @@ protected:
* The cinstructor of the dialog. It's protected because you should use the static public function openDialog.
* The dialog destroys itself if it was closed.
*/
- CSearchDialog(TQWidget *tqparent);
+ CSearchDialog(TQWidget *parent);
~CSearchDialog();
/**
diff --git a/bibletime/frontend/searchdialog/csearchdialogpages.cpp b/bibletime/frontend/searchdialog/csearchdialogpages.cpp
index 62481cb..790dd80 100644
--- a/bibletime/frontend/searchdialog/csearchdialogpages.cpp
+++ b/bibletime/frontend/searchdialog/csearchdialogpages.cpp
@@ -157,8 +157,8 @@ TQString StrongsResultClass::getStrongsNumberText(const TQString& verseContent,
********** CSearchDialogResultPage *********
********************************************/
-CSearchResultPage::CSearchResultPage(TQWidget *tqparent, const char *name ) :
- SearchResultsForm(tqparent, name) {
+CSearchResultPage::CSearchResultPage(TQWidget *parent, const char *name ) :
+ SearchResultsForm(parent, name) {
initView();
initConnections();
}
@@ -577,8 +577,8 @@ void CSearchResultPage::showAnalysis() {
namespace Options {
-CSearchOptionsPage::CSearchOptionsPage(TQWidget *tqparent, const char *name ) :
- SearchOptionsForm(tqparent,name) {
+CSearchOptionsPage::CSearchOptionsPage(TQWidget *parent, const char *name ) :
+ SearchOptionsForm(parent,name) {
initView();
readSettings();
}
diff --git a/bibletime/frontend/searchdialog/csearchdialogpages.h b/bibletime/frontend/searchdialog/csearchdialogpages.h
index c190111..fc39023 100644
--- a/bibletime/frontend/searchdialog/csearchdialogpages.h
+++ b/bibletime/frontend/searchdialog/csearchdialogpages.h
@@ -153,7 +153,7 @@ class CSearchResultPage : public SearchResultsForm {
Q_OBJECT
TQ_OBJECT
public:
- CSearchResultPage(TQWidget *tqparent=0, const char *name=0);
+ CSearchResultPage(TQWidget *parent=0, const char *name=0);
~CSearchResultPage();
/**
* Sets the modules which contain the result of each.
@@ -210,7 +210,7 @@ class CSearchOptionsPage : public SearchOptionsForm {
Q_OBJECT
TQ_OBJECT
public:
- CSearchOptionsPage(TQWidget *tqparent=0, const char *name=0);
+ CSearchOptionsPage(TQWidget *parent=0, const char *name=0);
~CSearchOptionsPage();
/**
* Sets the search text used in the page.
diff --git a/bibletime/frontend/searchdialog/csearchresultview.cpp b/bibletime/frontend/searchdialog/csearchresultview.cpp
index 9b82ea0..51c9492 100644
--- a/bibletime/frontend/searchdialog/csearchresultview.cpp
+++ b/bibletime/frontend/searchdialog/csearchresultview.cpp
@@ -28,8 +28,8 @@
namespace Search {
namespace Result {
-CSearchResultView::CSearchResultView(TQWidget* tqparent, const char* name) :
- KListView(tqparent, name), m_module(0) {
+CSearchResultView::CSearchResultView(TQWidget* parent, const char* name) :
+ KListView(parent, name), m_module(0) {
initView();
initConnections();
}
diff --git a/bibletime/frontend/searchdialog/csearchresultview.h b/bibletime/frontend/searchdialog/csearchresultview.h
index be9b128..f957534 100644
--- a/bibletime/frontend/searchdialog/csearchresultview.h
+++ b/bibletime/frontend/searchdialog/csearchresultview.h
@@ -40,7 +40,7 @@ class CSearchResultView : public KListView {
Q_OBJECT
TQ_OBJECT
public:
- CSearchResultView(TQWidget* tqparent, const char* name = 0);
+ CSearchResultView(TQWidget* parent, const char* name = 0);
virtual ~CSearchResultView();
/** Returns the module which is currently used. */
CSwordModuleInfo* const module();
diff --git a/bibletime/frontend/searchdialog/searchoptionsform.cpp b/bibletime/frontend/searchdialog/searchoptionsform.cpp
index df533bb..dc6a140 100644
--- a/bibletime/frontend/searchdialog/searchoptionsform.cpp
+++ b/bibletime/frontend/searchdialog/searchoptionsform.cpp
@@ -20,11 +20,11 @@
#include <tqwhatsthis.h>
/*
- * Constructs a SearchOptionsForm as a child of 'tqparent', with the
+ * Constructs a SearchOptionsForm as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-SearchOptionsForm::SearchOptionsForm( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+SearchOptionsForm::SearchOptionsForm( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
if ( !name )
setName( "SearchOptionsForm" );
diff --git a/bibletime/frontend/searchdialog/searchresultsform.cpp b/bibletime/frontend/searchdialog/searchresultsform.cpp
index 02bf70b..3cd254c 100644
--- a/bibletime/frontend/searchdialog/searchresultsform.cpp
+++ b/bibletime/frontend/searchdialog/searchresultsform.cpp
@@ -21,11 +21,11 @@
#include "csearchresultview.h"
/*
- * Constructs a SearchResultsForm as a child of 'tqparent', with the
+ * Constructs a SearchResultsForm as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-SearchResultsForm::SearchResultsForm( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+SearchResultsForm::SearchResultsForm( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
if ( !name )
setName( "SearchResultsForm" );
diff --git a/bibletime/frontend/util/csortlistviewitem.cpp b/bibletime/frontend/util/csortlistviewitem.cpp
index 959da2e..7278011 100644
--- a/bibletime/frontend/util/csortlistviewitem.cpp
+++ b/bibletime/frontend/util/csortlistviewitem.cpp
@@ -15,37 +15,37 @@
namespace util {
-CSortListViewItem::CSortListViewItem(TQListViewItem* tqparent) : KListViewItem(tqparent)
+CSortListViewItem::CSortListViewItem(TQListViewItem* parent) : KListViewItem(parent)
{
}
-CSortListViewItem::CSortListViewItem( TQListView * tqparent, TQListViewItem * after )
- : KListViewItem ( tqparent, after )
+CSortListViewItem::CSortListViewItem( TQListView * parent, TQListViewItem * after )
+ : KListViewItem ( parent, after )
{
}
-CSortListViewItem::CSortListViewItem( TQListViewItem * tqparent, TQListViewItem * after )
- : KListViewItem ( tqparent, after )
+CSortListViewItem::CSortListViewItem( TQListViewItem * parent, TQListViewItem * after )
+ : KListViewItem ( parent, after )
{
}
-CSortListViewItem::CSortListViewItem( TQListView * tqparent, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8 )
- : KListViewItem( tqparent, label1, label2, label3, label4, label5, label6, label7, label8 )
+CSortListViewItem::CSortListViewItem( TQListView * parent, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8 )
+ : KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
{
}
-CSortListViewItem::CSortListViewItem( TQListViewItem * tqparent, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8 )
- : KListViewItem ( tqparent, label1, label2, label3, label4, label5, label6, label7, label8 )
+CSortListViewItem::CSortListViewItem( TQListViewItem * parent, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8 )
+ : KListViewItem ( parent, label1, label2, label3, label4, label5, label6, label7, label8 )
{
}
-CSortListViewItem::CSortListViewItem( TQListView * tqparent, TQListViewItem * after, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8 )
- : KListViewItem ( tqparent, after, label1, label2, label3, label4, label5, label6, label7, label8 )
+CSortListViewItem::CSortListViewItem( TQListView * parent, TQListViewItem * after, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8 )
+ : KListViewItem ( parent, after, label1, label2, label3, label4, label5, label6, label7, label8 )
{
}
-CSortListViewItem::CSortListViewItem( TQListViewItem * tqparent, TQListViewItem * after, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8 )
- : KListViewItem ( tqparent, after, label1, label2, label3, label4, label5, label6, label7, label8 )
+CSortListViewItem::CSortListViewItem( TQListViewItem * parent, TQListViewItem * after, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8 )
+ : KListViewItem ( parent, after, label1, label2, label3, label4, label5, label6, label7, label8 )
{
}
diff --git a/bibletime/frontend/util/csortlistviewitem.h b/bibletime/frontend/util/csortlistviewitem.h
index b5e8a98..8b38d19 100644
--- a/bibletime/frontend/util/csortlistviewitem.h
+++ b/bibletime/frontend/util/csortlistviewitem.h
@@ -29,19 +29,19 @@ public:
Number, String/*, BibleKey*/
};
- CSortListViewItem( TQListViewItem* tqparent );
+ CSortListViewItem( TQListViewItem* parent );
- CSortListViewItem( TQListView * tqparent, TQListViewItem * after );
+ CSortListViewItem( TQListView * parent, TQListViewItem * after );
- CSortListViewItem( TQListViewItem * tqparent, TQListViewItem * after );
+ CSortListViewItem( TQListViewItem * parent, TQListViewItem * after );
- CSortListViewItem( TQListView * tqparent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() );
+ CSortListViewItem( TQListView * parent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() );
- CSortListViewItem( TQListViewItem * tqparent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() );
+ CSortListViewItem( TQListViewItem * parent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() );
- CSortListViewItem( TQListView * tqparent, TQListViewItem * after, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() );
+ CSortListViewItem( TQListView * parent, TQListViewItem * after, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() );
- CSortListViewItem( TQListViewItem * tqparent, TQListViewItem * after, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() );
+ CSortListViewItem( TQListViewItem * parent, TQListViewItem * after, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() );
virtual ~CSortListViewItem();
diff --git a/bibletime/util/ctoolclass.cpp b/bibletime/util/ctoolclass.cpp
index 9c823d7..12e018e 100644
--- a/bibletime/util/ctoolclass.cpp
+++ b/bibletime/util/ctoolclass.cpp
@@ -159,8 +159,8 @@ TQPixmap CToolClass::getIconForModule( CSwordModuleInfo* module_info ) {
return img;
}
-TQLabel* CToolClass::explanationLabel(TQWidget* tqparent, const TQString& heading, const TQString& text ) {
- TQLabel* label = new TQLabel( TQString::tqfromLatin1("<B>%1</B><BR>%2").tqarg(heading).tqarg(text),tqparent );
+TQLabel* CToolClass::explanationLabel(TQWidget* parent, const TQString& heading, const TQString& text ) {
+ TQLabel* label = new TQLabel( TQString::tqfromLatin1("<B>%1</B><BR>%2").tqarg(heading).tqarg(text),parent );
label->setAutoResize(true);
label->setMargin(1);
label->setFrameStyle(TQFrame::Box | TQFrame::Plain);
diff --git a/bibletime/util/ctoolclass.h b/bibletime/util/ctoolclass.h
index b1d1443..f87c5e4 100644
--- a/bibletime/util/ctoolclass.h
+++ b/bibletime/util/ctoolclass.h
@@ -65,7 +65,7 @@ public:
* This function returns a label with heading "heading" and explanation "text". This label should be used to
* explain difficult things of the GUI, e.g. in the optionsdialog.
*/
- static TQLabel* explanationLabel(TQWidget* tqparent, const TQString& heading, const TQString& text );
+ static TQLabel* explanationLabel(TQWidget* parent, const TQString& heading, const TQString& text );
/**
* Returns true if the character at position "pos" of text is inside an HTML tag. Returns false if it's not inside an HTML tag.
*/