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

Remove the tq in front of these incorrectly TQt4-converted methods/data members:

Browse Source 
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/bibletime@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent f8992044f2
commit 87507feff3
30 changed files with 106 additions and 106 deletions
Show Stats Download Patch File Download Diff File

4
bibletime/backend/cbookdisplay.cpp
Unescape View File

@ -57,13 +57,13 @@ namespace Rendering {
/**
* Check whether displaying displayLevel levels together is possible.
* For this count the childs and tqparents
* For this count the childs and parents
* of the required position
*/
int possibleLevels = 1; //we start with the default value of displayLevel, which means no entries together
while( key->parent() && (key->key() != "/") && !key->key().isEmpty() ) {//add tqparents
while( key->parent() && (key->key() != "/") && !key->key().isEmpty() ) {//add parents
++possibleLevels;
};

4
bibletime/bibletime_slots.cpp
Unescape View File

@ -326,10 +326,10 @@ void BibleTime::slotToggleToolbar() {
void BibleTime::slotToggleMainIndex() {
//we use the tqparent widget because the main index is enclosed in a tqlayout which adds the label at the top
if (m_viewMainIndex_action->isChecked()) {
m_mainIndex->tqparentWidget()->show();
m_mainIndex->parentWidget()->show();
}
else {
m_mainIndex->tqparentWidget()->hide();
m_mainIndex->parentWidget()->hide();
}
}

20
bibletime/frontend/cmdiarea.cpp
Unescape View File

@ -43,7 +43,7 @@ m_appCaption(TQString()) {
/** Initializes the view of the MDI area */
void CMDIArea::initView() {
setPaletteBackgroundColor( tqparentWidget()->paletteBackgroundColor() ); //work around a KDE bug (IMHO was in KDE 2.x)
setPaletteBackgroundColor( parentWidget()->paletteBackgroundColor() ); //work around a KDE bug (IMHO was in KDE 2.x)
}
/** Initilizes the connectiosn to SIGNALS */
@ -164,7 +164,7 @@ void CMDIArea::myTileHorizontal() {
if ((windows.count() == 1) && windows.at(0)) {
m_appCaption = windows.at(0)->caption();
windows.at(0)/*->tqparentWidget()*/->showMaximized();
windows.at(0)/*->parentWidget()*/->showMaximized();
}
else {
@ -179,13 +179,13 @@ void CMDIArea::myTileHorizontal() {
int y = 0;
for ( int i = 0; i < int(windows.count()); ++i ) {
TQWidget *window = windows.at(i);
window->tqparentWidget()->showNormal();
window->parentWidget()->showNormal();
tqApp->sendPostedEvents( 0, TQEvent::ShowNormal );
const int preferredHeight = window->minimumHeight() + window->tqparentWidget()->baseSize().height();
const int preferredHeight = window->minimumHeight() + window->parentWidget()->baseSize().height();
const int actHeight = TQMAX(heightForEach, preferredHeight);
window->tqparentWidget()->setGeometry( 0, y, width(), actHeight );
window->parentWidget()->setGeometry( 0, y, width(), actHeight );
y += actHeight;
}
@ -209,7 +209,7 @@ void CMDIArea::myCascade() {
if ((windows.count() == 1) && windows.at(0)) {
m_appCaption = windows.at(0)->caption();
windows.at(0)->tqparentWidget()->showMaximized();
windows.at(0)->parentWidget()->showMaximized();
}
else {
const int offsetX = 40;
@ -236,8 +236,8 @@ void CMDIArea::myCascade() {
window->setUpdatesEnabled(false);
window->tqparentWidget()->raise(); //make it the on-top-of-window-stack window to make sure they're in the right order
window->tqparentWidget()->setGeometry(x, y, windowWidth, windowHeight);
window->parentWidget()->raise(); //make it the on-top-of-window-stack window to make sure they're in the right order
window->parentWidget()->setGeometry(x, y, windowWidth, windowHeight);
x += offsetX;
y += offsetY;
@ -246,8 +246,8 @@ void CMDIArea::myCascade() {
setUpdatesEnabled(true);
active->tqparentWidget()->setGeometry(x, y, windowWidth, windowHeight);
active->tqparentWidget()->raise();
active->parentWidget()->setGeometry(x, y, windowWidth, windowHeight);
active->parentWidget()->raise();
active->setActiveWindow();
blockSignals(false);

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

@ -199,7 +199,7 @@ CDisplayConnections* const CDisplay::connectionsProxy() const {
return m_connections;
}
CDisplayWindow* const CDisplay::tqparentWindow() const {
CDisplayWindow* const CDisplay::parentWindow() const {
return m_parentWindow;
}

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

@ -96,7 +96,7 @@ public:
/**
* Returns the tqparent window used for this display widget.
*/
CDisplayWindow* const tqparentWindow() const;
CDisplayWindow* const parentWindow() const;
virtual void print( const CDisplay::TextPart, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) = 0;
/**
* Installs the popup which should be opened when the right mouse button was pressed.

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

@ -52,8 +52,8 @@
using namespace InfoDisplay;
CHTMLReadDisplay::CHTMLReadDisplay(CReadWindow* readWindow, TQWidget* tqparentWidget)
: KHTMLPart((m_view = new CHTMLReadDisplayView(this, tqparentWidget ? tqparentWidget : readWindow)), TQT_TQOBJECT(readWindow ? readWindow : tqparentWidget)),
CHTMLReadDisplay::CHTMLReadDisplay(CReadWindow* readWindow, TQWidget* parentWidget)
: KHTMLPart((m_view = new CHTMLReadDisplayView(this, parentWidget ? parentWidget : readWindow)), TQT_TQOBJECT(readWindow ? readWindow : parentWidget)),
CReadDisplay(readWindow),
m_currentAnchorCache(TQString()) {
setDNDEnabled(false);
@ -75,7 +75,7 @@ const TQString CHTMLReadDisplay::text( const CDisplay::TextType format, const CD
return document().toHTML();
}
else {
CDisplayWindow* window = tqparentWindow();
CDisplayWindow* window = parentWindow();
CSwordKey* const key = window->key();
CSwordModuleInfo* module = key->module();
//return htmlDocument().body().innerText().string().latin1();

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

@ -27,8 +27,8 @@
#include <kcolorbutton.h>
#include <kpopupmenu.h>
CHTMLWriteDisplay::CHTMLWriteDisplay(CWriteWindow* tqparentWindow, TQWidget* tqparent)
: CPlainWriteDisplay(tqparentWindow,tqparent) {
CHTMLWriteDisplay::CHTMLWriteDisplay(CWriteWindow* parentWindow, TQWidget* tqparent)
: CPlainWriteDisplay(parentWindow,tqparent) {
m_actions.bold = 0;
m_actions.italic = 0;
m_actions.underline = 0;

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

@ -52,7 +52,7 @@ public:
protected:
friend class CDisplay;
CHTMLWriteDisplay(CWriteWindow* tqparentWindow, TQWidget* tqparent);
CHTMLWriteDisplay(CWriteWindow* parentWindow, TQWidget* tqparent);
~CHTMLWriteDisplay();
/**
* Reimplementation to show a popup menu if the right mouse butoon was clicked.

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

@ -23,7 +23,7 @@
#include <kaction.h>
#include <klocale.h>
CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* tqparentWindow, TQWidget* tqparent) : TQTextEdit(tqparentWindow ? tqparentWindow : tqparent), CWriteDisplay(tqparentWindow) {
CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* tqparent) : TQTextEdit(parentWindow ? parentWindow : tqparent), CWriteDisplay(parentWindow) {
setTextFormat(TQt::PlainText);
setAcceptDrops(true);
viewport()->setAcceptDrops(true);

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

@ -66,7 +66,7 @@ protected:
friend class CDisplay;
friend class CHTMLWriteDisplay;
CPlainWriteDisplay(CWriteWindow* tqparentWindow, TQWidget* tqparent);
CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* tqparent);
virtual ~CPlainWriteDisplay();
/**
* Reimplementation from TQTextEdit. Provides an popup menu for the given position.

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

@ -59,12 +59,12 @@ const bool CReadDisplay::hasActiveAnchor() {
void CReadDisplay::print(const CDisplay::TextPart type, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) {
CDisplayWindow* window = tqparentWindow();
CDisplayWindow* window = parentWindow();
CSwordKey* const key = window->key();
CSwordModuleInfo* module = key->module();
CExportManager mgr(i18n("Print keys"),false, TQString(), tqparentWindow()->filterOptions(), tqparentWindow()->displayOptions());
CExportManager mgr(i18n("Print keys"),false, TQString(), parentWindow()->filterOptions(), parentWindow()->displayOptions());
switch (type) {
case Document: {

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

@ -221,7 +221,7 @@ void CBibleReadWindow::initToolbars() {
void CBibleReadWindow::initView() {
CLexiconReadWindow::initView();
tqparentWidget()->installEventFilter( this );
parentWidget()->installEventFilter( this );
}
/** Reimplementation. */

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

@ -352,7 +352,7 @@ const bool CDisplayWindow::init() {
setCaption(windowCaption());
//setup focus stuff.
setFocusPolicy(TQ_ClickFocus);
tqparentWidget()->setFocusPolicy(TQ_ClickFocus);
parentWidget()->setFocusPolicy(TQ_ClickFocus);
initActions();
initToolbars();

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

@ -114,15 +114,15 @@ void CReadWindow::lookup( CSwordKey* newKey ) {
/** Store the settings of this window in the given CProfileWindow object. */
void CReadWindow::storeProfileSettings(CProfileWindow * const settings) {
TQRect rect;
rect.setX(tqparentWidget()->x());
rect.setY(tqparentWidget()->y());
rect.setX(parentWidget()->x());
rect.setY(parentWidget()->y());
rect.setWidth(width());
rect.setHeight(height());
settings->setGeometry(rect);
// settings->setScrollbarPositions( m_htmlWidget->view()->horizontalScrollBar()->value(), m_htmlWidget->view()->verticalScrollBar()->value() );
settings->setType(modules().first()->type());
settings->setMaximized(isMaximized() || tqparentWidget()->isMaximized());
settings->setMaximized(isMaximized() || parentWidget()->isMaximized());
settings->setFocus( (this == mdi()->activeWindow()) ); //set property to true if this window is the active one.
if (key()) {
@ -149,17 +149,17 @@ void CReadWindow::storeProfileSettings(CProfileWindow * const settings) {
}
void CReadWindow::applyProfileSettings(CProfileWindow * const settings) {
// tqparentWidget()->setUpdatesEnabled(false);
// parentWidget()->setUpdatesEnabled(false);
setUpdatesEnabled(false);
if (settings->maximized()) { //maximize this window
// Use tqparentWidget() to call showMaximized. Otherwise we'd get lot's of X11 errors
tqparentWidget()->showMaximized();
// Use parentWidget() to call showMaximized. Otherwise we'd get lot's of X11 errors
parentWidget()->showMaximized();
}
else {
const TQRect rect = settings->tqgeometry();
resize(rect.width(), rect.height());
tqparentWidget()->move(rect.x(), rect.y());
parentWidget()->move(rect.x(), rect.y());
}
setUpdatesEnabled(true);

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

@ -55,15 +55,15 @@ void CWriteWindow::storeProfileSettings(CProfileWindow * const settings) {
settings->setWriteWindowType( writeWindowType() );
TQRect rect;
rect.setX(tqparentWidget()->x());
rect.setY(tqparentWidget()->y());
rect.setX(parentWidget()->x());
rect.setY(parentWidget()->y());
rect.setWidth(width());
rect.setHeight(height());
settings->setGeometry(rect);
// settings->setScrollbarPositions( m_htmlWidget->view()->horizontalScrollBar()->value(), m_htmlWidget->view()->verticalScrollBar()->value() );
settings->setType(modules().first()->type());
settings->setMaximized(isMaximized() || tqparentWidget()->isMaximized());
settings->setMaximized(isMaximized() || parentWidget()->isMaximized());
if (key()) {
sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key());
@ -92,12 +92,12 @@ void CWriteWindow::applyProfileSettings(CProfileWindow * const settings) {
setUpdatesEnabled(false);
if (settings->maximized()) {
tqparentWidget()->showMaximized();
parentWidget()->showMaximized();
}
else {
const TQRect rect = settings->tqgeometry();
resize(rect.width(), rect.height());
tqparentWidget()->move(rect.x(), rect.y());
parentWidget()->move(rect.x(), rect.y());
//setGeometry( settings->tqgeometry() );
}
// displayWidget()->view()->horizontalScrollBar()->setValue( settings->scrollbarPositions().horizontal );

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

@ -62,7 +62,7 @@
// m_chooser = chooser;
//
// // store old owner and position
// m_oldParent = chooser->tqparentWidget(false);
// m_oldParent = chooser->parentWidget(false);
// m_oldPos = chooser->pos();
//
// // we temporary borrow chooser widget from the MDI window

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

@ -57,8 +57,8 @@ CItemBase::CItemBase(CMainIndex* mainIndex, const Type type)
m_type(type),
m_sortingEnabled(true) {}
CItemBase::CItemBase(CItemBase* tqparentItem, const Type type)
: KListViewItem(tqparentItem),
CItemBase::CItemBase(CItemBase* parentItem, const Type type)
: KListViewItem(parentItem),
m_type(type),
m_sortingEnabled(true) {}
@ -140,7 +140,7 @@ void CItemBase::sort() {
/* ---------- new class: CModuleItem ------------ */
/* ---------------------------------------------- */
CModuleItem::CModuleItem(CTreeFolder* tqparentItem, CSwordModuleInfo* module) : CItemBase(tqparentItem), m_module(module) {}
CModuleItem::CModuleItem(CTreeFolder* parentItem, CSwordModuleInfo* module) : CItemBase(parentItem), m_module(module) {}
CModuleItem::~CModuleItem() {}
@ -252,8 +252,8 @@ const bool CModuleItem::enableAction( const MenuAction action ) {
/* ---------- new class: CBookmarkItem ------------*/
/* ----------------------------------------------*/
CBookmarkItem::CBookmarkItem(CFolderBase* tqparentItem, CSwordModuleInfo* module, const TQString& key, const TQString& description)
: CItemBase(tqparentItem),
CBookmarkItem::CBookmarkItem(CFolderBase* parentItem, CSwordModuleInfo* module, const TQString& key, const TQString& description)
: CItemBase(parentItem),
m_description(description),
m_moduleName(module ? module->name() : TQString()) {
if ((module && (module->type() == CSwordModuleInfo::Bible) || (module->type() == CSwordModuleInfo::Commentary)) ) {
@ -269,8 +269,8 @@ m_moduleName(module ? module->name() : TQString()) {
m_startupXML = TQDomElement(); //empty XML code
}
CBookmarkItem::CBookmarkItem(CFolderBase* tqparentItem, TQDomElement& xml )
: CItemBase(tqparentItem),
CBookmarkItem::CBookmarkItem(CFolderBase* parentItem, TQDomElement& xml )
: CItemBase(parentItem),
m_key(TQString()),
m_description(TQString()),
m_moduleName(TQString()) {
@ -445,9 +445,9 @@ bool CBookmarkItem::acceptDrop(const TQMimeSource* /*src*/) const {
CFolderBase::CFolderBase(CMainIndex* mainIndex, const Type type) : CItemBase(mainIndex, type) {}
CFolderBase::CFolderBase(CFolderBase* tqparentItem, const Type type) : CItemBase(tqparentItem, type) {}
CFolderBase::CFolderBase(CFolderBase* parentItem, const Type type) : CItemBase(parentItem, type) {}
CFolderBase::CFolderBase(CFolderBase* tqparentFolder, const TQString& caption) : CItemBase(tqparentFolder) {
CFolderBase::CFolderBase(CFolderBase* parentFolder, const TQString& caption) : CItemBase(parentFolder) {
setText(0, caption);
}
@ -715,54 +715,54 @@ namespace Bookmarks {
doc.appendChild(content);
//first create the bookmark groups in the XML document, then add the bookmarks to each tqparent
TQMap<int, TQDomElement> tqparentMap; //maps tqparent ids to dom elements
TQMap<int, TQDomElement> parentMap; //maps tqparent ids to dom elements
TQStringList groupList = config->readListEntry("Groups");
TQValueList<int> tqparentList = config->readIntListEntry("Group tqparents");
TQValueList<int> parentList = config->readIntListEntry("Group parents");
TQStringList::Iterator it_groups = groupList.begin();
TQValueList<int>::Iterator it_parents = tqparentList.begin();
TQValueList<int>::Iterator it_parents = parentList.begin();
int tqparentIDCounter = 0;
while ( (it_groups != groupList.end()) && (it_parents != tqparentList.end()) ) {
TQDomElement tqparentElement = (*it_parents == -1) ? content : tqparentMap[*it_parents];
if (tqparentElement.isNull()) {
int parentIDCounter = 0;
while ( (it_groups != groupList.end()) && (it_parents != parentList.end()) ) {
TQDomElement parentElement = (*it_parents == -1) ? content : parentMap[*it_parents];
if (parentElement.isNull()) {
qWarning("EMPTY PARENT FOUND!");
tqparentElement = content;
parentElement = content;
};
TQDomElement elem = doc.createElement("Folder");
elem.setAttribute("caption", (*it_groups));
tqparentMap.insert(tqparentIDCounter, elem);
parentMap.insert(parentIDCounter, elem);
tqparentElement.appendChild( elem );
parentElement.appendChild( elem );
++it_parents;
++it_groups;
++tqparentIDCounter;
++parentIDCounter;
}
//groups are now read in, create now the bookmarks
tqparentList = config->readIntListEntry("Bookmark tqparents");
parentList = config->readIntListEntry("Bookmark parents");
TQStringList bookmarkList = config->readListEntry("Bookmarks");
TQStringList bookmarkModulesList = config->readListEntry("Bookmark modules");
TQStringList bookmarkDescriptionsList = config->readListEntry("Bookmark descriptions");
it_parents = tqparentList.begin();
it_parents = parentList.begin();
TQStringList::Iterator it_bookmarks = bookmarkList.begin();
TQStringList::Iterator it_modules = bookmarkModulesList.begin();
TQStringList::Iterator it_descriptions = bookmarkDescriptionsList.begin();
while ( it_bookmarks != bookmarkList.end()
&& it_parents != tqparentList.end()
&& it_parents != parentList.end()
&& it_modules != bookmarkModulesList.end()
) {
TQDomElement tqparentElement = ((*it_parents) == -1) ? content : tqparentMap[(*it_parents)];
if (tqparentElement.isNull()) {
TQDomElement parentElement = ((*it_parents) == -1) ? content : parentMap[(*it_parents)];
if (parentElement.isNull()) {
qWarning("EMPTY PARENT FOUND!");
tqparentElement = content;
parentElement = content;
};
TQDomElement elem = doc.createElement("Bookmark");
@ -773,7 +773,7 @@ namespace Bookmarks {
CSwordModuleInfo* m = CPointers::backend()->findModuleByName( *it_modules );
elem.setAttribute("moduledescription", m ? m->config(CSwordModuleInfo::Description) : TQString());
tqparentElement.appendChild( elem );
parentElement.appendChild( elem );
++it_parents;
@ -833,12 +833,12 @@ OldBookmarksFolder::OldBookmarksFolder(CTreeFolder* folder) : CBookmarkFolder(fo
// New class SubFolder
SubFolder::SubFolder(CFolderBase* tqparentItem, const TQString& caption) : CBookmarkFolder(tqparentItem, BookmarkFolder) {
SubFolder::SubFolder(CFolderBase* parentItem, const TQString& caption) : CBookmarkFolder(parentItem, BookmarkFolder) {
m_startupXML = TQDomElement();
setText( 0, caption );
}
SubFolder::SubFolder(CFolderBase* tqparentItem, TQDomElement& xml ) : CBookmarkFolder(tqparentItem, BookmarkFolder) {
SubFolder::SubFolder(CFolderBase* parentItem, TQDomElement& xml ) : CBookmarkFolder(parentItem, BookmarkFolder) {
m_startupXML = xml;
}
@ -912,7 +912,7 @@ SubFolder::SubFolder(CFolderBase* tqparentItem, TQDomElement& xml ) : CBookmarkF
//restore all child items
TQDomElement child = elem.firstChild().toElement();
CItemBase* oldItem = 0;
while ( !child.isNull() && child.tqparentNode() == elem ) {
while ( !child.isNull() && child.parentNode() == elem ) {
CItemBase* i = 0;
if (child.tagName() == "Folder") {
i = new Bookmarks::SubFolder(this, child);
@ -939,7 +939,7 @@ CBookmarkFolder::CBookmarkFolder(CMainIndex* mainIndex, const Type type) : CTree
setSortingEnabled(false);
}
CBookmarkFolder::CBookmarkFolder(CFolderBase* tqparentItem, const Type type) : CTreeFolder(tqparentItem, type, "*") {
CBookmarkFolder::CBookmarkFolder(CFolderBase* parentItem, const Type type) : CTreeFolder(parentItem, type, "*") {
setSortingEnabled(false);
}
@ -1059,7 +1059,7 @@ const bool CBookmarkFolder::loadBookmarksFromXML( const TQString& xml ) {
CItemBase* oldItem = 0;
//restore all child items
TQDomElement child = document.firstChild().toElement();
while ( !child.isNull() && child.tqparentNode() == document) {
while ( !child.isNull() && child.parentNode() == document) {
CItemBase* i = 0;
if (child.tagName() == "Folder") {
i = new Bookmarks::SubFolder(this, child);

18
bibletime/frontend/mainindex/cindexitem.h
Unescape View File

@ -167,8 +167,8 @@ private:
class CBookmarkItem : public CItemBase {
public:
CBookmarkItem(CFolderBase* tqparentItem, CSwordModuleInfo* module, const TQString& key, const TQString& description);
CBookmarkItem(CFolderBase* tqparentItem, TQDomElement& xml);
CBookmarkItem(CFolderBase* parentItem, CSwordModuleInfo* module, const TQString& key, const TQString& description);
CBookmarkItem(CFolderBase* parentItem, TQDomElement& xml);
virtual ~CBookmarkItem();
CSwordModuleInfo* const module();
const TQString key();
@ -228,8 +228,8 @@ private: // Private methods
class CFolderBase : public CItemBase {
public:
CFolderBase(CMainIndex* mainIndex, const Type type);
CFolderBase(CFolderBase* tqparentFolder, const Type type);
CFolderBase(CFolderBase* tqparentFolder, const TQString& caption);
CFolderBase(CFolderBase* parentFolder, const Type type);
CFolderBase(CFolderBase* parentFolder, const TQString& caption);
virtual ~CFolderBase();
virtual const bool isFolder();
@ -263,7 +263,7 @@ protected:
class CTreeFolder : public CFolderBase {
public:
CTreeFolder(CMainIndex* mainIndex, const Type type, const TQString& language );
CTreeFolder(CFolderBase* tqparentFolder, const Type type, const TQString& language );
CTreeFolder(CFolderBase* parentFolder, const Type type, const TQString& language );
virtual ~CTreeFolder();
virtual void addGroup(const Type type, const TQString language);
@ -284,7 +284,7 @@ private:
class CGlossaryFolder : public CTreeFolder {
public:
CGlossaryFolder(CMainIndex* mainIndex, const Type type, const TQString& fromLanguage, const TQString& toLanguage );
CGlossaryFolder(CFolderBase* tqparentFolder, const Type type, const TQString& fromLanguage, const TQString& toLanguage );
CGlossaryFolder(CFolderBase* parentFolder, const Type type, const TQString& fromLanguage, const TQString& toLanguage );
virtual ~CGlossaryFolder();
virtual void initTree();
@ -309,7 +309,7 @@ private:
class CBookmarkFolder : public CTreeFolder {
public:
CBookmarkFolder(CMainIndex* mainIndex, const Type type = BookmarkFolder);
CBookmarkFolder(CFolderBase* tqparentItem, const Type type = BookmarkFolder);
CBookmarkFolder(CFolderBase* parentItem, const Type type = BookmarkFolder);
virtual ~CBookmarkFolder();
virtual const bool enableAction(const MenuAction action);
virtual void exportBookmarks();
@ -365,8 +365,8 @@ private:
class SubFolder : public CBookmarkFolder {
public:
SubFolder(CFolderBase* tqparentItem, const TQString& caption);
SubFolder(CFolderBase* tqparentItem, TQDomElement& xml);
SubFolder(CFolderBase* parentItem, const TQString& caption);
SubFolder(CFolderBase* parentItem, TQDomElement& xml);
virtual ~SubFolder();
virtual void init();
/**

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

@ -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 tqparentItem = dynamic_cast<CItemBase*>(tqparent);
CItemBase* const parentItem = dynamic_cast<CItemBase*>(tqparent);
CItemBase* const afterItem = dynamic_cast<CItemBase*>(after);
bool removeSelectedItems = true;
@ -305,11 +305,11 @@ void CMainIndex::dropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewIt
afterItem->setOpen(true);
afterItem->dropped(e); //inserts new items, moving only works on the same level
}
else if (afterItem && !afterItem->isFolder() && tqparentItem) {
else if (afterItem && !afterItem->isFolder() && parentItem) {
const bool justMoveSelected =
(e->source() == viewport())
&& m_itemsMovable
&& tqparentItem->acceptDrop(e)
&& parentItem->acceptDrop(e)
&& !afterItem->acceptDrop(e);
if (justMoveSelected) {
@ -324,18 +324,18 @@ void CMainIndex::dropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewIt
afterItem->dropped(e, after);
}
else { //insert in the tqparent folder and then move the inserted items
tqparentItem->dropped(e, after);
parentItem->dropped(e, after);
}
}
tqparentItem->setOpen(true);
parentItem->setOpen(true);
}
else if (tqparentItem) { //no after item present, but a tqparent is there
else if (parentItem) { //no after item present, but a tqparent is there
moveSelectedItems = false;
removeSelectedItems = false;
tqparentItem->setOpen(true);
tqparentItem->dropped(e);
parentItem->setOpen(true);
parentItem->dropped(e);
}
if (moveSelectedItems) {

2
bibletime/frontend/manageindicesform.ui
Unescape View File

@ -107,7 +107,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>

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

@ -267,8 +267,8 @@ void CModuleChooser::setModules( ListCSwordModuleInfo modules ) {
/****************************/
CModuleChooserDialog::CModuleChooserDialog( TQWidget* tqparentDialog, ListCSwordModuleInfo modules ) :
KDialogBase(Plain, i18n("Choose work(s)"), Ok, Ok, tqparentDialog, "CModuleChooser", false, true) {
CModuleChooserDialog::CModuleChooserDialog( TQWidget* parentDialog, ListCSwordModuleInfo modules ) :
KDialogBase(Plain, i18n("Choose work(s)"), Ok, Ok, parentDialog, "CModuleChooser", false, true) {
initView();
initConnections();

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

@ -87,7 +87,7 @@ class CModuleChooserDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
CModuleChooserDialog(TQWidget* tqparentDialog, ListCSwordModuleInfo modules);
CModuleChooserDialog(TQWidget* parentDialog, ListCSwordModuleInfo modules);
~CModuleChooserDialog();
signals:

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

@ -71,7 +71,7 @@ void CRangeChooserDialog::RangeItem::setCaption(const TQString newCaption) {
/**************************/
CRangeChooserDialog::CRangeChooserDialog( TQWidget* tqparentDialog ) : KDialogBase(Plain, i18n("Search range editor"), Default | Ok | Cancel, Ok, tqparentDialog, "CRangeChooserDialog", false, true) {
CRangeChooserDialog::CRangeChooserDialog( TQWidget* parentDialog ) : KDialogBase(Plain, i18n("Search range editor"), Default | Ok | Cancel, Ok, parentDialog, "CRangeChooserDialog", false, true) {
initView();
initConnections();

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

@ -48,7 +48,7 @@ class CRangeChooserDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
CRangeChooserDialog(TQWidget* tqparentDialog);
CRangeChooserDialog(TQWidget* parentDialog);
~CRangeChooserDialog();
protected: // Protected methods

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

@ -67,7 +67,7 @@ const int LEGEND_WIDTH = 85;
/****************************/
CSearchAnalysisDialog::CSearchAnalysisDialog( ListCSwordModuleInfo modules, TQWidget* tqparentDialog ) : KDialogBase(Plain, i18n("Search analysis"), Close, Close, tqparentDialog, 0, true) {
CSearchAnalysisDialog::CSearchAnalysisDialog( ListCSwordModuleInfo modules, TQWidget* parentDialog ) : KDialogBase(Plain, i18n("Search analysis"), Close, Close, parentDialog, 0, true) {
initView();
initConnections();
m_analysis->reset();
@ -420,8 +420,8 @@ CSearchAnalysisView::CSearchAnalysisView(TQCanvas* canvas, TQWidget* tqparent)
/** Returns the tqsizeHint for this view */
TQSize CSearchAnalysisView::tqsizeHint() {
if ( tqparentWidget() )
return tqparentWidget()->tqsizeHint();
if ( parentWidget() )
return parentWidget()->tqsizeHint();
return TQCanvasView::tqsizeHint();
}
@ -434,7 +434,7 @@ void CSearchAnalysisView::resizeEvent( TQResizeEvent* e) {
CSearchAnalysisView::ToolTip::ToolTip(TQWidget* tqparent) : TQToolTip(tqparent) {}
void CSearchAnalysisView::ToolTip::maybeTip(const TQPoint& p) {
CSearchAnalysisView* view = dynamic_cast<CSearchAnalysisView*>(tqparentWidget());
CSearchAnalysisView* view = dynamic_cast<CSearchAnalysisView*>(parentWidget());
if (!view)
return;
TQPoint point(p);

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

@ -104,7 +104,7 @@ class CSearchAnalysisDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
CSearchAnalysisDialog(ListCSwordModuleInfo modules, TQWidget* tqparentDialog);
CSearchAnalysisDialog(ListCSwordModuleInfo modules, TQWidget* parentDialog);
~CSearchAnalysisDialog();
protected: // Protected methods

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

@ -49,9 +49,9 @@ namespace Search {
static CSearchDialog* m_staticDialog = 0;
void CSearchDialog::openDialog(const ListCSwordModuleInfo modules, const TQString& searchText, TQWidget* tqparentDialog) {
void CSearchDialog::openDialog(const ListCSwordModuleInfo modules, const TQString& searchText, TQWidget* parentDialog) {
if (!m_staticDialog) {
m_staticDialog = new CSearchDialog(tqparentDialog);
m_staticDialog = new CSearchDialog(parentDialog);
};
m_staticDialog->reset();

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

@ -49,7 +49,7 @@ class CSearchDialog : public KDialogBase {
TQ_OBJECT
public:
static void openDialog(const ListCSwordModuleInfo modules, const TQString& searchText = TQString(), TQWidget* tqparentDialog = 0);
static void openDialog(const ListCSwordModuleInfo modules, const TQString& searchText = TQString(), TQWidget* parentDialog = 0);
protected:
friend class Analysis::CSearchAnalysis;

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

@ -190,7 +190,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="3" margin="0"/>
<layoutdefaults spacing="3" margin="0"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>kcombobox.h</includehint>

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

@ -188,7 +188,7 @@
<data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>cmoduleresultview.h</includehint>
<includehint>csearchresultview.h</includehint>

Write Preview
Loading…
Cancel
Save