TDE
/
tdewebdev
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdewebdev
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/kdewebdev@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent a40b0e89b6
commit 929d7ae4f6
314 changed files with 1431 additions and 1431 deletions
Show Stats Download Patch File Download Diff File

2
kfilereplace/kaddstringdlgs.ui
Unescape View File

@ -422,5 +422,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

4
kfilereplace/kfilereplacepart.cpp
Unescape View File

@ -60,11 +60,11 @@ typedef KParts::GenericFactory<KFileReplacePart> FileReplaceFactory;
K_EXPORT_COMPONENT_FACTORY( libkfilereplacepart, FileReplaceFactory )
KFileReplacePart::KFileReplacePart(TQWidget* tqparentWidget, const char* , TQObject* tqparent, const char* name, const TQStringList & ) : KParts::ReadOnlyPart(tqparent,name)
KFileReplacePart::KFileReplacePart(TQWidget* parentWidget, const char* , TQObject* tqparent, const char* name, const TQStringList & ) : KParts::ReadOnlyPart(tqparent,name)
{
setInstance(FileReplaceFactory::instance());
KGlobal::locale()->insertCatalogue("kfilereplace");
m_parentWidget = tqparentWidget;
m_parentWidget = parentWidget;
m_config = new KConfig("kfilereplacerc");
m_aboutDlg = 0;
m_stop = false;

2
kfilereplace/kfilereplacepart.h
Unescape View File

@ -47,7 +47,7 @@ class KFileReplacePart: public KParts::ReadOnlyPart
int m_optionMask;
public://Constructors
KFileReplacePart(TQWidget *tqparentWidget,
KFileReplacePart(TQWidget *parentWidget,
const char *widgetName,
TQObject *tqparent,
const char *name,

2
kfilereplace/kfilereplaceview.cpp
Unescape View File

@ -257,7 +257,7 @@ void KFileReplaceView::slotResultEdit()
if(!success)
{
TQString message = i18n("File %1 cannot be opened. Might be a DCOP problem.").tqarg(path);
KMessageBox::error(tqparentWidget(), message);
KMessageBox::error(parentWidget(), message);
}
}
if (lviChild == lvi)

2
kfilereplace/kfilereplaceviewwdg.ui
Unescape View File

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

2
kfilereplace/knewprojectdlgs.ui
Unescape View File

@ -894,5 +894,5 @@
<tabstop>m_dedDateMin</tabstop>
<tabstop>m_dedDateMax</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kfilereplace/koptionsdlgs.ui
Unescape View File

@ -343,5 +343,5 @@
<tabstop>m_chbFollowSymLinks</tabstop>
<tabstop>m_chbIgnoreHidden</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

10
kimagemapeditor/kimagemapeditor.cpp
Unescape View File

@ -84,7 +84,7 @@
typedef KParts::GenericFactory<KImageMapEditor> KimeFactory;
K_EXPORT_COMPONENT_FACTORY( libkimagemapeditor , KimeFactory )
KImageMapEditor::KImageMapEditor(TQWidget *tqparentWidget, const char *,
KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *,
TQObject *tqparent, const char *name, const TQStringList & )
: KParts::ReadWritePart(tqparent,name)
{
@ -101,7 +101,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *tqparentWidget, const char *,
if (mainDock) {
// kdDebug() << "KImageMapEditor: We got a KDockMainWindow !" << endl;
KDockWidget* tqparentDock = mainDock->getMainDockWidget();
KDockWidget* parentDock = mainDock->getMainDockWidget();
areaDock = mainDock->createDockWidget( "Areas", 0L, 0L, i18n("Areas"), i18n("Areas"));
mapsDock = mainDock->createDockWidget( "Maps", 0L, 0L, i18n("Maps"), i18n("Maps"));
imagesDock = mainDock->createDockWidget( "Images", 0L, 0L, i18n("Images"), i18n("Images"));
@ -114,7 +114,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *tqparentWidget, const char *,
mapsDock->setWidget(mapsListView);
imagesDock->setWidget(imagesListView);
areaDock->manualDock( (KDockWidget*) tqparentDock, KDockWidget::DockLeft, 30);
areaDock->manualDock( (KDockWidget*) parentDock, KDockWidget::DockLeft, 30);
mapsDock->manualDock( (KDockWidget*) areaDock, KDockWidget::DockCenter);
imagesDock->manualDock( (KDockWidget*) mapsDock, KDockWidget::DockCenter);
@ -125,7 +125,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *tqparentWidget, const char *,
areaDock = 0L;
mapsDock = 0L;
imagesDock = 0L;
splitter = new TQSplitter(tqparentWidget);
splitter = new TQSplitter(parentWidget);
tabWidget = new TQTabWidget(splitter);
areaListView = new AreaListView(tabWidget,"AreaListView");
mapsListView = new MapsListView(tabWidget, "MapsListView");
@ -174,7 +174,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *tqparentWidget, const char *,
splitter->setResizeMode(tabWidget,TQSplitter::KeepSize);
setWidget(splitter);
} else {
drawZone = new DrawZone(tqparentWidget,this);
drawZone = new DrawZone(parentWidget,this);
setWidget(drawZone);
}

2
kimagemapeditor/kimagemapeditor.h
Unescape View File

@ -134,7 +134,7 @@ class KImageMapEditor : public KParts::ReadWritePart {
public :
enum ToolType { Selection, Rectangle, Circle, Polygon, Freehand, AddPoint, RemovePoint };
KImageMapEditor(TQWidget *tqparentWidget, const char *,
KImageMapEditor(TQWidget *parentWidget, const char *,
TQObject *tqparent, const char *name, const TQStringList & args = TQStringList());
virtual ~KImageMapEditor();

4
klinkstatus/src/engine/linkstatus.cpp
Unescape View File

@ -90,7 +90,7 @@ void LinktqStatus::reset()
redirection_ = 0;
}
}
Q_ASSERT(!tqparent_);
Q_ASSERT(!parent_);
base_URI_ = "";
}
@ -100,7 +100,7 @@ TQString const LinktqStatus::toString() const
if(!is_root_)
{
Q_ASSERT(tqparent_);
Q_ASSERT(parent_);
aux += i18n( "Parent: %1" ).tqarg( tqparent()->absoluteUrl().prettyURL() ) + "\n";
}
Q_ASSERT(!original_url_.isNull());

2
klinkstatus/src/engine/linkstatus.h
Unescape View File

@ -163,7 +163,7 @@ private:
bool error_occurred_;
bool is_redirection_;
vector<Node*> tqchildren_nodes_;
LinktqStatus* tqparent_;
LinktqStatus* parent_;
LinktqStatus* redirection_;
bool checked_;
bool only_check_header_;

10
klinkstatus/src/engine/linkstatus_impl.h
Unescape View File

@ -20,7 +20,7 @@
inline LinktqStatus::LinktqStatus()
: status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
error_occurred_(false), is_redirection_(false), tqparent_(0), redirection_(0), checked_(false),
error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false),
only_check_header_(true), malformed_(false),
node_(0), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
mimetype_(""), is_error_page_(false), tree_view_item_(0)
@ -28,7 +28,7 @@ inline LinktqStatus::LinktqStatus()
inline LinktqStatus::LinktqStatus(KURL const& absolute_url)
: status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
error_occurred_(false), is_redirection_(false), tqparent_(0), redirection_(0), checked_(false),
error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false),
only_check_header_(true), malformed_(false),
node_(0), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
mimetype_(""), is_error_page_(false), tree_view_item_(0)
@ -38,7 +38,7 @@ inline LinktqStatus::LinktqStatus(KURL const& absolute_url)
inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* tqparent)
: status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
error_occurred_(false), is_redirection_(false), tqparent_(0), redirection_(0), checked_(false),
error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false),
only_check_header_(true), malformed_(false),
node_(node), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
mimetype_(""), is_error_page_(false), tree_view_item_(0)
@ -69,7 +69,7 @@ inline void LinktqStatus::setParent(LinktqStatus* tqparent)
{
Q_ASSERT(tqparent);
tqparent_ = tqparent;
parent_ = tqparent;
addReferrer(tqparent->absoluteUrl());
}
@ -263,7 +263,7 @@ inline bool LinktqStatus::isLocalRestrict() const
inline LinktqStatus const* LinktqStatus::tqparent() const
{
return tqparent_;
return parent_;
}
inline TQString const& LinktqStatus::originalUrl() const

2
klinkstatus/src/engine/searchmanager.cpp
Unescape View File

@ -618,7 +618,7 @@ bool SearchManager::checkable(KURL const& url, LinktqStatus const& link_parent)
if(!check_parent_dirs_)
{
if(Url::tqparentDir(root_.absoluteUrl(), url))
if(Url::parentDir(root_.absoluteUrl(), url))
return false;
}
if(!check_external_links_)

4
klinkstatus/src/klinkstatus_part.cpp
Unescape View File

@ -55,7 +55,7 @@ const char KLinkStatusPart::version_[] = "0.3.2";
typedef KParts::GenericFactory<KLinkStatusPart> KLinkStatusFactory;
K_EXPORT_COMPONENT_FACTORY( libklinkstatuspart, KLinkStatusFactory )
KLinkStatusPart::KLinkStatusPart(TQWidget *tqparentWidget, const char *widgetName,
KLinkStatusPart::KLinkStatusPart(TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const TQStringList & /*string_list*/)
: KParts::ReadOnlyPart(tqparent, name), m_dlgAbout(0)
@ -66,7 +66,7 @@ KLinkStatusPart::KLinkStatusPart(TQWidget *tqparentWidget, const char *widgetNam
ActionManager::setInstance(action_manager_);
initGUI();
tabwidget_ = new TabWidgetSession(tqparentWidget, widgetName);
tabwidget_ = new TabWidgetSession(parentWidget, widgetName);
setWidget(tabwidget_);
action_manager_->initTabWidget(tabwidget_);

2
klinkstatus/src/klinkstatus_part.h
Unescape View File

@ -39,7 +39,7 @@ class KLinkStatusPart: public KParts::ReadOnlyPart
Q_OBJECT
TQ_OBJECT
public:
KLinkStatusPart(TQWidget *tqparentWidget, const char *widgetName,
KLinkStatusPart(TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const TQStringList& args);
virtual ~KLinkStatusPart();

2
klinkstatus/src/parser/url.cpp
Unescape View File

@ -296,7 +296,7 @@ bool Url::localDomain(KURL const& url1, KURL const& url2, bool restrict)
/**
Returns true if url2 is a tqparent of url1.
*/
bool Url::tqparentDir(KURL const& url1, KURL const& url2)
bool Url::parentDir(KURL const& url1, KURL const& url2)
{
if(url1.protocol() != url2.protocol())
return false;

2
klinkstatus/src/parser/url.h
Unescape View File

@ -45,7 +45,7 @@ bool equalHost(TQString const& host1, TQString const& host2, bool restrict = fal
bool hasProtocol(TQString const& url);
TQString convertToLocal(LinktqStatus const* ls);
bool localDomain(KURL const& url1, KURL const& url2, bool restrict = true);
bool tqparentDir(KURL const& url1, KURL const& url2);
bool parentDir(KURL const& url1, KURL const& url2);
bool externalLink(KURL const& url1, KURL const& url2, bool restrict = true);
}

2
klinkstatus/src/ui/resultview.h
Unescape View File

@ -127,7 +127,7 @@ protected:
LinktqStatus* ls_;
int column_index_;
int tqalignment_;
int alignment_;
};

6
klinkstatus/src/ui/sessionwidget.cpp
Unescape View File

@ -392,15 +392,15 @@ void SessionWidget::slotLinkChecked(LinktqStatus const* linkstatus, LinkChecker
if(linkstatus->checked())
{
TreeViewItem* tree_view_item = 0;
TreeViewItem* tqparent_item = linkstatus->tqparent()->treeViewItem();
TreeViewItem* parent_item = linkstatus->tqparent()->treeViewItem();
bool match = resultsSearchBar->currentLinkMatcher().matches(*linkstatus);
if(tree_display_)
{
//kdDebug(23100) << "TREE!!!!!" << endl;
tree_view_item = new TreeViewItem(tree_view, tqparent_item, tqparent_item->lastChild(), linkstatus);
tree_view_item = new TreeViewItem(tree_view, parent_item, parent_item->lastChild(), linkstatus);
tqparent_item->setLastChild(tree_view_item);
parent_item->setLastChild(tree_view_item);
if(follow_last_link_checked_)
tree_view->ensureRowVisible(tree_view_item, tree_display_);

2
klinkstatus/src/ui/sessionwidgetbase.ui
Unescape View File

@ -590,7 +590,7 @@
<slot specifier="pure virtual">slotCancel()</slot>
<slot specifier="pure virtual">slotClearComboUrl()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klshistorycombo.h</includehint>
<includehint>kpushbutton.h</includehint>

2
klinkstatus/src/ui/settings/configidentificationdialogui.ui
Unescape View File

@ -126,7 +126,7 @@
<tabstop>kcfg_UserAgent</tabstop>
<tabstop>buttonDefault</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>

2
klinkstatus/src/ui/settings/configresultsdialog.ui
Unescape View File

@ -68,5 +68,5 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
klinkstatus/src/ui/settings/configsearchdialog.ui
Unescape View File

@ -343,7 +343,7 @@
<tabstop>kcfg_CheckExternalLinks</tabstop>
<tabstop>kcfg_RememberCheckSettings</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

8
klinkstatus/src/ui/tablelinkstatus.cpp
Unescape View File

@ -387,7 +387,7 @@ void TableLinkstatus::slotEditReferrerWithQuanta(KURL const& url)
if(!success)
{
TQString message = i18n("<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>").tqarg(filePath);
KMessageBox::error(tqparentWidget(), message);
KMessageBox::error(parentWidget(), message);
}
}
else
@ -443,7 +443,7 @@ TableItem::TableItem(TQTable* table, EditType et,
int column_index, int tqalignment)
: TQTableItem(table, et, ""), ResultViewItem(linkstatus, column_index),
/*ls_((LinktqStatus*)linkstatus),
column_index_(column_index),*/ tqalignment_(tqalignment)
column_index_(column_index),*/ alignment_(tqalignment)
{
//Q_ASSERT(ls_);
//Q_ASSERT(column_index_ > 0);
@ -469,12 +469,12 @@ int TableItem::columnIndex() const
void TableItem::tqsetAlignment(int aFlags)
{
tqalignment_ = aFlags;
alignment_ = aFlags;
}
int TableItem::tqalignment() const
{
return tqalignment_;
return alignment_;
}
/*
LinktqStatus const* const TableItem::linktqStatus() const

2
klinkstatus/src/ui/tablelinkstatus.h
Unescape View File

@ -135,7 +135,7 @@ private:
//LinktqStatus* ls_;
//int column_index_;
int tqalignment_;
int alignment_;
};

2
klinkstatus/src/ui/treeview.cpp
Unescape View File

@ -293,7 +293,7 @@ void TreeView::slotEditReferrerWithQuanta(KURL const& url)
if(!success)
{
TQString message = i18n("<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>").tqarg(filePath);
KMessageBox::error(tqparentWidget(), message);
KMessageBox::error(parentWidget(), message);
}
}
else

4
klinkstatus/src/ui/treeview.h
Unescape View File

@ -75,7 +75,7 @@ private:
double columnsWidth() const;
private:
int current_column_; // aptqparently it's impossible to know what is the current column
int current_column_; // apparently it's impossible to know what is the current column
bool tree_display_;
};
@ -93,7 +93,7 @@ public:
TreeViewItem(TreeView* tqparent, TQListViewItem* after,
LinktqStatus const* linkstatus);
TreeViewItem(TreeView* root, TQListViewItem* tqparent_item, TQListViewItem* after,
TreeViewItem(TreeView* root, TQListViewItem* parent_item, TQListViewItem* after,
LinktqStatus const* linkstatus);
virtual ~TreeViewItem();

4
kommander/Kommander-TODO.kno
Unescape View File

@ -238,7 +238,7 @@
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Sans Serif">
<p><span style="font-weight:600">Executing Kommander scripts</span></p>
<ul type="disc"><li>detect and handle missing plugin widgets</li>
<li>cache @pid, @dcopid, @tqparentPid, perhaps calculate and cache @tqparentdcopid</li>
<li>cache @pid, @dcopid, @parentPid, perhaps calculate and cache @parentdcopid</li>
<li>handle multiple dialogs: they could be packaged in single *.tgz file, unpacked and executed internally</li>
<div></div>
<div><br /></div></ul>
@ -284,7 +284,7 @@
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Georgia">
<li type="disc"><span style="font-weight:600">ChangeLog of Kommander</span></li>
<li type="disc"><span style="font-style:italic">See ChangeLog file for details and dates</span></li>
<ul type="disc"><li>added @tqparentPid evaluated to tqparent process pid</li>
<ul type="disc"><li>added @parentPid evaluated to tqparent process pid</li>
<li>added @pid evaluated to current process pid</li>
<li>added @dcopid evaluated to current process DCOP id</li>
<li>significantly improved Kommander Text editor usability</li>

20
kommander/editor/actiondnd.cpp
Unescape View File

@ -194,7 +194,7 @@ void QDesignerToolBar::findFormWindow()
while ( w ) {
if ( w->inherits( "FormWindow" ) )
formWindow = (FormWindow*)w;
w = w->tqparentWidget();
w = w->parentWidget();
}
}
@ -720,7 +720,7 @@ void QDesignerMenuBar::findFormWindow()
while ( w ) {
if ( w->inherits( "FormWindow" ) )
formWindow = (FormWindow*)w;
w = w->tqparentWidget();
w = w->parentWidget();
}
}
@ -741,14 +741,14 @@ void QDesignerMenuBar::contextMenuEvent( TQContextMenuEvent *e )
TQMenuItem *item = tqfindItem( idAt( itm ) );
RemoveMenuCommand *cmd = new RemoveMenuCommand( i18n("Delete Menu '%1'" ).tqarg( item->text() ),
formWindow,
(TQMainWindow*)tqparentWidget(), this,
(TQMainWindow*)parentWidget(), this,
(QDesignerPopupMenu*)item->popup(),
idAt( itm ), itm, item->text() );
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
// #### need to do a proper tqinvalidate and re-tqlayout
tqparentWidget()->tqlayout()->tqinvalidate();
tqparentWidget()->tqlayout()->activate();
parentWidget()->tqlayout()->tqinvalidate();
parentWidget()->tqlayout()->activate();
} else if ( res == 2 ) {
bool ok;
TQString old = text( idAt( itm ) );
@ -1044,8 +1044,8 @@ void QDesignerPopupMenu::createPopupMenu()
formWindow, a, this, insertAt );
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
( (QDesignerMenuBar*)( (TQMainWindow*)tqparentWidget() )->menuBar() )->hidePopups();
( (QDesignerMenuBar*)( (TQMainWindow*)tqparentWidget() )->menuBar() )->activateItemAt( -1 );
( (QDesignerMenuBar*)( (TQMainWindow*)parentWidget() )->menuBar() )->hidePopups();
( (QDesignerMenuBar*)( (TQMainWindow*)parentWidget() )->menuBar() )->activateItemAt( -1 );
popup( p );
}
// set this back to zero so we know a popup (will soon) not exist.
@ -1169,8 +1169,8 @@ void QDesignerPopupMenu::dropEvent( TQDropEvent *e )
formWindow->commandHistory()->addCommand( cmd );
cmd->execute();
( (QDesignerMenuBar*)( (TQMainWindow*)tqparentWidget() )->menuBar() )->hidePopups();
( (QDesignerMenuBar*)( (TQMainWindow*)tqparentWidget() )->menuBar() )->activateItemAt( -1 );
( (QDesignerMenuBar*)( (TQMainWindow*)parentWidget() )->menuBar() )->hidePopups();
( (QDesignerMenuBar*)( (TQMainWindow*)parentWidget() )->menuBar() )->activateItemAt( -1 );
indicator->hide();
popup( p );
}
@ -1239,7 +1239,7 @@ void QDesignerPopupMenu::findFormWindow()
while ( w ) {
if ( w->inherits( "FormWindow" ) )
formWindow = (FormWindow*)w;
w = w->tqparentWidget();
w = w->parentWidget();
}
}

4
kommander/editor/actioneditor.ui
Unescape View File

@ -2,7 +2,7 @@
<class>ActionEditorBase</class>
<include location="local" implDecl="in declaration">actioneditor.ui.h</include>
<forward>class QListViewItem;</forward>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<widget class="TQWidget">
<property name="name">
<cstring>ActionEditorBase</cstring>
@ -18,7 +18,7 @@
<property name="caption">
<string>Edit Actions</string>
</property>
<property name="tqlayoutMargin" stdset="0">
<property name="layoutMargin" stdset="0">
</property>
<vbox>
<property name="name">

2
kommander/editor/assoctexteditor.ui
Unescape View File

@ -218,5 +218,5 @@
<Q_SLOTS>
<slot>AssocTextEditorBase_destroyed(QObject*)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/editor/choosewidget.ui
Unescape View File

@ -143,7 +143,7 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>

50
kommander/editor/command.cpp
Unescape View File

@ -236,7 +236,7 @@ void ResizeCommand::execute()
widget->setGeometry( newRect );
formWindow()->updateSelection( widget );
formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) );
if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
formWindow()->updateChildSelections( widget );
}
@ -245,7 +245,7 @@ void ResizeCommand::unexecute()
widget->setGeometry( oldRect );
formWindow()->updateSelection( widget );
formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) );
if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
formWindow()->updateChildSelections( widget );
}
@ -312,7 +312,7 @@ bool MoveCommand::canMerge( Command *c )
void MoveCommand::execute()
{
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout ) {
if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) {
if ( newParent && oldParent && newParent != oldParent ) {
TQPoint pos = newParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) );
w->reparent( newParent, pos, true );
@ -333,7 +333,7 @@ void MoveCommand::execute()
void MoveCommand::unexecute()
{
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout ) {
if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) {
if ( newParent && oldParent && newParent != oldParent ) {
TQPoint pos = oldParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) );
w->reparent( oldParent, pos, true );
@ -517,7 +517,7 @@ bool SetPropertyCommand::checkProperty()
}
if ( widget->tqparent() && widget->tqparent()->inherits( "FormWindow" ) )
formWindow()->mainWindow()->formNameChanged( (FormWindow*)( (TQWidget*)widget )->tqparentWidget() );
formWindow()->mainWindow()->formNameChanged( (FormWindow*)( (TQWidget*)widget )->parentWidget() );
}
return true;
}
@ -552,9 +552,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
if ( v.toBool() )
align |= WordBreak;
widget->setProperty( "tqalignment", TQVariant( align ) );
} else if ( propName == "tqlayoutSpacing" ) {
} else if ( propName == "layoutSpacing" ) {
MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), v.toInt() );
} else if ( propName == "tqlayoutMargin" ) {
} else if ( propName == "layoutMargin" ) {
MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), v.toInt() );
} else if ( propName == "toolTip" || propName == "whatsThis" || propName == "database" || propName == "frameworkCode" ) {
MetaDataBase::setFakeProperty( editor->widget(), propName, v );
@ -628,9 +628,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
// ------------------------------------------------------------
LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl )
: Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase )
: Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase )
{
}
@ -651,9 +651,9 @@ void LayoutHorizontalCommand::unexecute()
// ------------------------------------------------------------
LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl )
: Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, true, true )
: Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, true, true )
{
}
@ -674,9 +674,9 @@ void LayoutHorizontalSplitCommand::unexecute()
// ------------------------------------------------------------
LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl )
: Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase )
: Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase )
{
}
@ -697,9 +697,9 @@ void LayoutVerticalCommand::unexecute()
// ------------------------------------------------------------
LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl )
: Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, true, true )
: Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, true, true )
{
}
@ -720,9 +720,9 @@ void LayoutVerticalSplitCommand::unexecute()
// ------------------------------------------------------------
LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl, int xres, int yres )
: Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
: Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
{
}
@ -743,19 +743,19 @@ void LayoutGridCommand::unexecute()
// ------------------------------------------------------------
BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw,
TQWidget *tqlayoutBase, const TQWidgetList &wl )
: Command( n, fw ), lb( tqlayoutBase ), widgets( wl )
TQWidget *layoutBase, const TQWidgetList &wl )
: Command( n, fw ), lb( layoutBase ), widgets( wl )
{
WidgetFactory::LayoutType lay = WidgetFactory::tqlayoutType( tqlayoutBase );
spacing = MetaDataBase::spacing( TQT_TQOBJECT(tqlayoutBase) );
margin = MetaDataBase::margin( TQT_TQOBJECT(tqlayoutBase) );
WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase );
spacing = MetaDataBase::spacing( TQT_TQOBJECT(layoutBase) );
margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) );
tqlayout = 0;
if ( lay == WidgetFactory::HBox )
tqlayout = new HorizontalLayout( wl, tqlayoutBase, fw, tqlayoutBase, false, tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
tqlayout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
else if ( lay == WidgetFactory::VBox )
tqlayout = new VerticalLayout( wl, tqlayoutBase, fw, tqlayoutBase, false, tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
tqlayout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
else if ( lay == WidgetFactory::Grid )
tqlayout = new GridLayout( wl, tqlayoutBase, fw, tqlayoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), false );
tqlayout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), false );
}
void BreakLayoutCommand::execute()

12
kommander/editor/command.h
Unescape View File

@ -255,7 +255,7 @@ class LayoutHorizontalCommand : public Command
{
public:
LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl );
void execute();
@ -271,7 +271,7 @@ class LayoutHorizontalSplitCommand : public Command
{
public:
LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl );
void execute();
@ -287,7 +287,7 @@ class LayoutVerticalCommand : public Command
{
public:
LayoutVerticalCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl );
void execute();
@ -303,7 +303,7 @@ class LayoutVerticalSplitCommand : public Command
{
public:
LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl );
void execute();
@ -319,7 +319,7 @@ class LayoutGridCommand : public Command
{
public:
LayoutGridCommand( const TQString &n, FormWindow *fw,
TQWidget *tqparent, TQWidget *tqlayoutBase,
TQWidget *tqparent, TQWidget *layoutBase,
const TQWidgetList &wl, int xres, int yres );
void execute();
@ -335,7 +335,7 @@ class BreakLayoutCommand : public Command
{
public:
BreakLayoutCommand( const TQString &n, FormWindow *fw,
TQWidget *tqlayoutBase, const TQWidgetList &wl );
TQWidget *layoutBase, const TQWidgetList &wl );
void execute();
void unexecute();

2
kommander/editor/connectioneditor.ui
Unescape View File

@ -403,7 +403,7 @@
<slot access="protected">Q_SLOTSChanged()</slot>
<slot access="protected">cancelClicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>klistbox.h</includehint>

2
kommander/editor/formsettings.ui
Unescape View File

@ -329,7 +329,7 @@
<Q_SLOTS>
<slot>okClicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>

4
kommander/editor/formsettingsimpl.cpp
Unescape View File

@ -35,8 +35,8 @@ FormSettings::FormSettings( TQWidget *tqparent, FormWindow *fw )
editVersion->setText(info.version);
editLicense->setText(info.license);
editComment->setText(info.comment);
spinSpacing->setValue(formwindow->tqlayoutDefaultSpacing());
spinMargin->setValue(formwindow->tqlayoutDefaultMargin());
spinSpacing->setValue(formwindow->layoutDefaultSpacing());
spinMargin->setValue(formwindow->layoutDefaultMargin());
}
void FormSettings::okClicked()

114
kommander/editor/formwindow.cpp
Unescape View File

@ -460,9 +460,9 @@ void FormWindow::handleContextMenu(TQContextMenuEvent *e, TQWidget *w)
selectWidget(TQT_TQOBJECT(w));
// if widget is laid out, find the first non-laid out super-widget
TQWidget *realWidget = w; // but store the original one
while (w->tqparentWidget() && (WidgetFactory::tqlayoutType(w->tqparentWidget()) !=
while (w->parentWidget() && (WidgetFactory::layoutType(w->parentWidget()) !=
WidgetFactory::NoLayout || !insertedWidgets.tqfind(w)))
w = w->tqparentWidget();
w = w->parentWidget();
if (mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) &&
((TQMainWindow*)mainContainer())->centralWidget() == realWidget)
{
@ -503,7 +503,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
if (!isMainContainer(TQT_TQOBJECT(w)) && qstrcmp(w->name(), "central widget") != 0)
{ // press on a child widget
// if the clicked widget is not in a tqlayout, raise it
if (!w->tqparentWidget() || WidgetFactory::tqlayoutType(w->tqparentWidget()) == WidgetFactory::NoLayout)
if (!w->parentWidget() || WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout)
w->raise();
if ((e->state() & ControlButton))
{ // with control pressed, always start rubber band selection
@ -522,7 +522,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
{ // ...widget selected
// only if widget has a tqlayout (it is a tqlayout meta widget or a laid out container!),
// unselect its childs
if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout)
if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout)
{
TQObjectList *l = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
setPropertyShowingBlocked(true);
@ -550,10 +550,10 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
selectWidget(TQT_TQOBJECT(w));
// if widget is laid out, find the first non-laid out super-widget
while (w->tqparentWidget() &&
(WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout
while (w->parentWidget() &&
(WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout
|| !insertedWidgets.tqfind(w)))
w = w->tqparentWidget();
w = w->parentWidget();
if (e->button() == Qt::LeftButton)
{ // left button: store original tqgeometry and more as the widget might start moving
@ -563,12 +563,12 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
origPressPos = oldPressPos;
checkedSelectionsForMove = false;
moving.clear();
if (w->tqparentWidget() && !isMainContainer(TQT_TQOBJECT(w->tqparentWidget())) &&
!isCentralWidget(TQT_TQOBJECT(w->tqparentWidget())))
if (w->parentWidget() && !isMainContainer(TQT_TQOBJECT(w->parentWidget())) &&
!isCentralWidget(TQT_TQOBJECT(w->parentWidget())))
{
targetContainer = w->tqparentWidget();
hadOwnPalette = w->tqparentWidget()->ownPalette();
restorePalette = w->tqparentWidget()->palette();
targetContainer = w->parentWidget();
hadOwnPalette = w->parentWidget()->ownPalette();
restorePalette = w->parentWidget()->palette();
}
}
}
@ -643,7 +643,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
}
else
{
wid = wid->tqparentWidget();
wid = wid->parentWidget();
if (!wid)
break;
}
@ -695,9 +695,9 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w)
if (widgetPressed && allowMove(w))
{ // we are prepated for a move
// if widget is laid out, find the first non-laid out super-widget
while (w->tqparentWidget() && (WidgetFactory::tqlayoutType(w->tqparentWidget()) !=
while (w->parentWidget() && (WidgetFactory::layoutType(w->parentWidget()) !=
WidgetFactory::NoLayout || !insertedWidgets.tqfind(w)))
w = w->tqparentWidget();
w = w->parentWidget();
// calc correct position
TQPoint pos = w->mapFromGlobal(e->globalPos());
// calc move distance and store it
@ -807,7 +807,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w)
arg(connectReceiver->name()));
tqApp->processEvents();
if (drawRecRect)
restoreRect(TQRect(mapToForm(((TQWidget*)oldReceiver)->tqparentWidget(),
restoreRect(TQRect(mapToForm(((TQWidget*)oldReceiver)->parentWidget(),
((TQWidget*)oldReceiver)->pos()), ((TQWidget*)oldReceiver)->size()));
drawConnectLine();
break;
@ -848,7 +848,7 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
emitUpdateProperties(propertyWidget);
TQMapConstIterator < ulong, TQPoint > it = moving.begin();
TQWidget *oldParent = ((TQWidget *) it.key())->tqparentWidget();
TQWidget *oldParent = ((TQWidget *) it.key())->parentWidget();
TQWidget *newParent = oldParent;
// check whether we have to reparent the selection
TQWidget *wa = containerAt(e->globalPos(), ((TQWidget *) it.key()));
@ -857,12 +857,12 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
wa = WidgetFactory::containerOfWidget(wa);
// ok, looks like we moved onto a container
// check whether we really have different tqparents.
if (wa == ((TQWidget *) it.key())->tqparentWidget())
// check whether we really have different parents.
if (wa == ((TQWidget *) it.key())->parentWidget())
goto make_move_command;
// break tqlayout if necessary
if (WidgetFactory::tqlayoutType(wa) != WidgetFactory::NoLayout)
if (WidgetFactory::layoutType(wa) != WidgetFactory::NoLayout)
{
if (KMessageBox::questionYesNo(mainWindow(),
i18n("You tried to insert a widget into the "
@ -883,14 +883,14 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
TQWidget *i = (TQWidget *) it.key();
if (!emitSelChanged && i->inherits(TQBUTTON_OBJECT_NAME_STRING))
{
if (i->tqparentWidget() && i->tqparentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING) ||
if (i->parentWidget() && i->parentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING) ||
wa->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING))
emitSelChanged = true;
if (!wa->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING))
{
MetaDataBase::setPropertyChanged(TQT_TQOBJECT(i), "buttonGroupId", false);
if (i->tqparentWidget() && i->tqparentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING))
((TQButtonGroup *) i->tqparentWidget())->remove((TQButton *) i);
if (i->parentWidget() && i->parentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING))
((TQButtonGroup *) i->parentWidget())->remove((TQButton *) i);
}
}
TQPoint pos = wa->mapFromGlobal(i->mapToGlobal(TQPoint(0, 0)));
@ -935,10 +935,10 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
case CONNECT_TOOL:
restoreConnectionLine();
if (connectSender)
restoreRect(TQRect(mapToForm(((TQWidget *) connectSender)->tqparentWidget(),
restoreRect(TQRect(mapToForm(((TQWidget *) connectSender)->parentWidget(),
((TQWidget *) connectSender)->pos()), ((TQWidget *) connectSender)->size()));
if (connectReceiver)
restoreRect(TQRect(mapToForm(((TQWidget *) connectReceiver)->tqparentWidget(),
restoreRect(TQRect(mapToForm(((TQWidget *) connectReceiver)->parentWidget(),
((TQWidget *) connectReceiver)->pos()), ((TQWidget *) connectReceiver)->size()));
endUnclippedPainter();
tqApp->processEvents();
@ -951,7 +951,7 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
if (insertParent)
{ // we should insert the new widget now
endRectDraw();
if (WidgetFactory::tqlayoutType(insertParent) != WidgetFactory::NoLayout)
if (WidgetFactory::layoutType(insertParent) != WidgetFactory::NoLayout)
{
if (KMessageBox::questionYesNo(mainWindow(),
i18n("You tried to insert a widget into the "
@ -1314,8 +1314,8 @@ void FormWindow::moveSelectedWidgets(int dx, int dy)
{
WidgetSelection *s = it.current();
TQWidget *w = s->widget();
if (w->tqparentWidget()
&& WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout)
if (w->parentWidget()
&& WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout)
continue;
w->move(w->x() + dx, w->y() + dy);
s->updateGeometry();
@ -1374,7 +1374,7 @@ void FormWindow::checkSelectionsForMove(TQWidget * w)
{
checkedSelectionsForMove = true;
TQObjectList *l = w->tqparentWidget()->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, false);
TQObjectList *l = w->parentWidget()->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, false);
moving.clear();
if (l)
{
@ -1387,11 +1387,11 @@ void FormWindow::checkSelectionsForMove(TQWidget * w)
++it;
if (l->tqfind(TQT_TQOBJECT(sel->widget())) == -1)
{
if (WidgetFactory::tqlayoutType(w) == WidgetFactory::NoLayout)
if (WidgetFactory::layoutType(w) == WidgetFactory::NoLayout)
sel->setWidget(0);
} else
{
if (WidgetFactory::tqlayoutType(sel->widget()->tqparentWidget()) == WidgetFactory::NoLayout)
if (WidgetFactory::layoutType(sel->widget()->parentWidget()) == WidgetFactory::NoLayout)
{
moving.insert((ulong) sel->widget(), sel->widget()->pos());
sel->widget()->raise();
@ -1447,8 +1447,8 @@ void FormWindow::editAdjustSize()
}
for (TQWidget * w = widgets.first(); w; w = widgets.next())
{
if (w->tqparentWidget()
&& WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout)
if (w->parentWidget()
&& WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout)
continue;
TQRect oldr = w->tqgeometry();
w->adjustSize();
@ -1618,10 +1618,10 @@ void FormWindow::currentToolChanged()
case CONNECT_TOOL:
restoreConnectionLine();
if (connectSender)
restoreRect(TQRect(mapToForm(((TQWidget *) connectSender)->tqparentWidget(),
restoreRect(TQRect(mapToForm(((TQWidget *) connectSender)->parentWidget(),
((TQWidget *) connectSender)->pos()), ((TQWidget *) connectSender)->size()));
if (connectReceiver)
restoreRect(TQRect(mapToForm(((TQWidget *) connectReceiver)->tqparentWidget(),
restoreRect(TQRect(mapToForm(((TQWidget *) connectReceiver)->parentWidget(),
((TQWidget *) connectReceiver)->pos()), ((TQWidget *) connectReceiver)->size()));
endUnclippedPainter();
break;
@ -1694,7 +1694,7 @@ void FormWindow::showOrderIndicators()
for (TQObject * o = l->first(); o; o = l->next())
{
TQWidget *w = (TQWidget *) o;
if (w->isVisibleTo(w->tqparentWidget()) &&
if (w->isVisibleTo(w->parentWidget()) &&
insertedWidgets[(void *) w] && w->focusPolicy() != TQ_NoFocus)
{
OrderIndicator *ind = new OrderIndicator(order++, w, this);
@ -1903,7 +1903,7 @@ void FormWindow::selectAll()
emitSelectionChanged();
}
void FormWindow::tqlayoutHorizontal()
void FormWindow::layoutHorizontal()
{
TQWidgetList widgets(selectedWidgets());
LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand(i18n("Lay OutQt::Horizontally"),
@ -1913,7 +1913,7 @@ void FormWindow::tqlayoutHorizontal()
cmd->execute();
}
void FormWindow::tqlayoutVertical()
void FormWindow::layoutVertical()
{
TQWidgetList widgets(selectedWidgets());
LayoutVerticalCommand *cmd = new LayoutVerticalCommand(i18n("Lay OutQt::Vertically"),
@ -1923,7 +1923,7 @@ void FormWindow::tqlayoutVertical()
cmd->execute();
}
void FormWindow::tqlayoutHorizontalSplit()
void FormWindow::layoutHorizontalSplit()
{
TQWidgetList widgets(selectedWidgets());
LayoutHorizontalSplitCommand *cmd =
@ -1934,7 +1934,7 @@ void FormWindow::tqlayoutHorizontalSplit()
cmd->execute();
}
void FormWindow::tqlayoutVerticalSplit()
void FormWindow::layoutVerticalSplit()
{
TQWidgetList widgets(selectedWidgets());
LayoutVerticalSplitCommand *cmd =
@ -1945,7 +1945,7 @@ void FormWindow::tqlayoutVerticalSplit()
cmd->execute();
}
void FormWindow::tqlayoutGrid()
void FormWindow::layoutGrid()
{
int xres = grid().x();
int yres = grid().y();
@ -1958,7 +1958,7 @@ void FormWindow::tqlayoutGrid()
cmd->execute();
}
void FormWindow::tqlayoutHorizontalContainer(TQWidget * w)
void FormWindow::layoutHorizontalContainer(TQWidget * w)
{
if (w == this)
w = mainContainer();
@ -1979,7 +1979,7 @@ void FormWindow::tqlayoutHorizontalContainer(TQWidget * w)
cmd->execute();
}
void FormWindow::tqlayoutVerticalContainer(TQWidget * w)
void FormWindow::layoutVerticalContainer(TQWidget * w)
{
if (w == this)
w = mainContainer();
@ -2000,7 +2000,7 @@ void FormWindow::tqlayoutVerticalContainer(TQWidget * w)
cmd->execute();
}
void FormWindow::tqlayoutGridContainer(TQWidget * w)
void FormWindow::layoutGridContainer(TQWidget * w)
{
if (w == this)
w = mainContainer();
@ -2035,7 +2035,7 @@ void FormWindow::breakLayout(TQWidget * w)
{
if (!w || w == this)
break;
if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout &&
if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout &&
WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w)))))
{
Command *cmd = breakLayoutCommand(w);
@ -2044,7 +2044,7 @@ void FormWindow::breakLayout(TQWidget * w)
if (!w->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && !w->inherits(TQSPLITTER_OBJECT_NAME_STRING))
break;
}
w = w->tqparentWidget();
w = w->parentWidget();
}
if (commands.isEmpty())
@ -2113,13 +2113,13 @@ bool FormWindow::hasInsertedChildren(TQWidget *w) const
bool FormWindow::allowMove(TQWidget *w)
{
w = w->tqparentWidget();
w = w->parentWidget();
while (w)
{
if ((isMainContainer(TQT_TQOBJECT(w)) || insertedWidgets.tqfind(w)) && WidgetFactory::tqlayoutType(w) ==
if ((isMainContainer(TQT_TQOBJECT(w)) || insertedWidgets.tqfind(w)) && WidgetFactory::layoutType(w) ==
WidgetFactory::NoLayout)
return true;
w = w->tqparentWidget();
w = w->parentWidget();
}
return false;
}
@ -2410,7 +2410,7 @@ TQPoint FormWindow::mapToForm(const TQWidget* w, const TQPoint& pos) const
while (i && !i->isTopLevel() && !isMainContainer(TQT_TQOBJECT(const_cast<TQWidget*>(i))))
{
p = i->mapToParent(p);
i = i->tqparentWidget();
i = i->parentWidget();
}
return mapFromGlobal(w->mapToGlobal(pos));
}
@ -2421,7 +2421,7 @@ static int widgetDepth(TQWidget *w)
while (w && !w->isTopLevel())
{
d++;
w = w->tqparentWidget();
w = w->parentWidget();
}
return d;
@ -2433,7 +2433,7 @@ static bool isChildOf(TQWidget *c, TQWidget *p)
{
if (c == p)
return true;
c = c->tqparentWidget();
c = c->parentWidget();
}
return false;
}
@ -2469,14 +2469,14 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf)
{
if (!TQT_TQRECT_OBJECT(w->rect()).tqcontains((w->mapFromGlobal(pos))))
break;
w = w->tqparentWidget();
w = w->parentWidget();
}
if (w && !w->isTopLevel()) continue; // we did not get through the full while loop
int wd = widgetDepth(it.current());
if (wd == depth && container && (it.current()->tqparentWidget()->
if (wd == depth && container && (it.current()->parentWidget()->
childrenListObject()).tqfind(TQT_TQOBJECT(it.current())) >
(container->tqparentWidget()->childrenListObject()).tqfind(TQT_TQOBJECT(container)))
(container->parentWidget()->childrenListObject()).tqfind(TQT_TQOBJECT(container)))
wd++;
if (wd > depth && !isChildOf(it.current(), notParentOf)) {
depth = wd;
@ -2575,12 +2575,12 @@ TQObject *FormWindow::connectableObject(TQObject *w, TQObject *)
return w;
}
int FormWindow::tqlayoutDefaultSpacing() const
int FormWindow::layoutDefaultSpacing() const
{
return defSpacing;
}
int FormWindow::tqlayoutDefaultMargin() const
int FormWindow::layoutDefaultMargin() const
{
return defMargin;
}

20
kommander/editor/formwindow.h
Unescape View File

@ -85,15 +85,15 @@ public:
virtual void raiseWidgets();
virtual void checkAccels();
virtual void tqlayoutHorizontal();
virtual void tqlayoutVertical();
virtual void tqlayoutHorizontalSplit();
virtual void tqlayoutVerticalSplit();
virtual void tqlayoutGrid();
virtual void layoutHorizontal();
virtual void layoutVertical();
virtual void layoutHorizontalSplit();
virtual void layoutVerticalSplit();
virtual void layoutGrid();
virtual void tqlayoutHorizontalContainer( TQWidget *w );
virtual void tqlayoutVerticalContainer( TQWidget *w );
virtual void tqlayoutGridContainer( TQWidget *w );
virtual void layoutHorizontalContainer( TQWidget *w );
virtual void layoutVerticalContainer( TQWidget *w );
virtual void layoutGridContainer( TQWidget *w );
virtual void breakLayout( TQWidget *w );
@ -178,8 +178,8 @@ public:
void killAccels( TQObject *top );
int tqlayoutDefaultSpacing() const;
int tqlayoutDefaultMargin() const;
int layoutDefaultSpacing() const;
int layoutDefaultMargin() const;
void setLayoutDefaultSpacing( int s );
void setLayoutDefaultMargin( int s );

2
kommander/editor/functions.ui
Unescape View File

@ -695,7 +695,7 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>ktextbrowser.h</includehint>
<includehint>kcombobox.h</includehint>

2
kommander/editor/hierarchyview.cpp
Unescape View File

@ -366,7 +366,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent )
TQListViewItem *item = 0;
TQString className = WidgetFactory::classNameOf( o );
if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) {
switch ( WidgetFactory::tqlayoutType( (TQWidget*)o ) ) {
switch ( WidgetFactory::layoutType( (TQWidget*)o ) ) {
case WidgetFactory::HBox:
className = "HBox";
break;

6
kommander/editor/kommander-new.xml
Unescape View File

@ -76,7 +76,7 @@
<item>null</item>
<item>pid</item>
<item>dcopid</item>
<item>tqparentPid</item>
<item>parentPid</item>
<item>debug</item>
<item>echo</item>
<item>env</item>
@ -260,7 +260,7 @@
<!-- FindCommands matches many items that can be expected outside strings, substitutions etc. -->
<context attribute="Normal Text" lineEndContext="#stay" name="FindCommands">
<!-- start expression in double tqparentheses -->
<!-- start expression in double parentheses -->
<Detect2Chars attribute="Keyword" context="ExprDblParen" char="(" char1="(" beginRegion="expression" />
<!-- start expression in double brackets -->
<RegExpr attribute="Keyword" context="ExprDblBracket" String="\[\[&eos;" beginRegion="expression" column="0"/>
@ -524,7 +524,7 @@
</context>
<!-- Case is called after the case keyword is encoutered. We handle this because of
the lonely closing tqparentheses that would otherwise disturb the expr matching -->
the lonely closing parentheses that would otherwise disturb the expr matching -->
<context attribute="Normal Text" lineEndContext="#stay" name="Case">
<RegExpr attribute="Keyword" context="CaseIn" String="\sin\b" />
<IncludeRules context="FindAll" />

8
kommander/editor/kommander.xml
Unescape View File

@ -69,7 +69,7 @@
<item>null</item>
<item>pid</item>
<item>dcopid</item>
<item>tqparentPid</item>
<item>parentPid</item>
<item>debug</item>
<item>echo</item>
<item>env</item>
@ -598,7 +598,7 @@
<IncludeRules context="##Alerts" />
</context>
<!-- FindCommentsParen consumes shell comments till EOL or a closing tqparenthese -->
<!-- FindCommentsParen consumes shell comments till EOL or a closing parenthese -->
<context attribute="Normal Text" lineEndContext="#pop" name="FindCommentsParen">
<DetectChar attribute="Comment" context="CommentParen" char="#" firstNonSpace="true"/>
<RegExpr attribute="Normal Text" context="CommentParen" String="[\s;](?=#)" />
@ -621,7 +621,7 @@
<!-- FindCommands matches many items that can be expected outside strings, substitutions etc. -->
<context attribute="Normal Text" lineEndContext="#stay" name="FindCommands">
<!-- start expression in double tqparentheses -->
<!-- start expression in double parentheses -->
<Detect2Chars attribute="Keyword" context="ExprDblParen" char="(" char1="(" beginRegion="expression" />
<!-- start expression in double brackets -->
<RegExpr attribute="Keyword" context="ExprDblBracket" String="\[\[&eos;" beginRegion="expression" column="0"/>
@ -900,7 +900,7 @@
</context>
<!-- Case is called after the case keyword is encoutered. We handle this because of
the lonely closing tqparentheses that would otherwise disturb the expr matching -->
the lonely closing parentheses that would otherwise disturb the expr matching -->
<context attribute="Normal Text" lineEndContext="#stay" name="Case">
<RegExpr attribute="Keyword" context="CaseIn" String="\sin\b" />
<IncludeRules context="FindMost" />

142
kommander/editor/layout.cpp
Unescape View File

@ -37,18 +37,18 @@ bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> &
/*!
\class Layout tqlayout.h
\brief Baseclass for tqlayouting widgets in the Designer
\brief Baseclass for layouting widgets in the Designer
Classes derived from this abstract base class are used for tqlayouting
Classes derived from this abstract base class are used for layouting
operations in the Designer.
*/
/*! \a p specifies the tqparent of the tqlayoutBase \a lb. The tqparent
might be changed in setup(). If the tqlayoutBase is a
container, the tqparent and the tqlayoutBase are the same. Also they
/*! \a p specifies the tqparent of the layoutBase \a lb. The tqparent
might be changed in setup(). If the layoutBase is a
container, the tqparent and the layoutBase are the same. Also they
always have to be a widget known to the designer (e.g. in the case
of the tabwidget tqparent and tqlayoutBase are the tabwidget and not the
of the tabwidget tqparent and layoutBase are the tabwidget and not the
page which actually gets laid out. For actual usage the correct
widget is found later by Layout.)
*/
@ -57,13 +57,13 @@ Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *l
: widgets( wl ), tqparent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter )
{
widgets.setAutoDelete( false );
tqlayoutBase = lb;
if ( !doSetup && tqlayoutBase )
oldGeometry = tqlayoutBase->tqgeometry();
layoutBase = lb;
if ( !doSetup && layoutBase )
oldGeometry = layoutBase->tqgeometry();
}
/*! The widget list we got in the constructor might contain too much
widgets (like widgets with different tqparents, already laid out
widgets (like widgets with different parents, already laid out
widgets, etc.). Here we set up the list and so the only the "best"
widgets get laid out.
*/
@ -83,14 +83,14 @@ void Layout::setup()
// childs which has the most entries.
// Widgets which are already laid out are thrown away here too
for ( w = widgets.first(); w; w = widgets.next() ) {
if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
continue;
if ( lastParent != w->tqparentWidget() ) {
if ( lastParent != w->parentWidget() ) {
lastList = 0;
lastParent = w->tqparentWidget();
lastParent = w->parentWidget();
TQValueList<TQWidgetList>::Iterator it = lists.begin();
for ( ; it != lists.end(); ++it ) {
if ( ( *it ).first()->tqparentWidget() == w->tqparentWidget() )
if ( ( *it ).first()->parentWidget() == w->parentWidget() )
lastList = &( *it );
}
if ( !lastList ) {
@ -115,9 +115,9 @@ void Layout::setup()
// best list has only one entry and we do not tqlayout a container,
// we leave here.
if ( !lastList || ( lastList->count() < 2 &&
( !tqlayoutBase ||
( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( tqlayoutBase )) ) ) &&
tqlayoutBase != formWindow->mainContainer() ) )
( !layoutBase ||
( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( layoutBase )) ) ) &&
layoutBase != formWindow->mainContainer() ) )
) ) {
widgets.clear();
startPoint = TQPoint( 0, 0 );
@ -128,7 +128,7 @@ void Layout::setup()
// to tqlayout
widgets = *lastList;
// Also use the only correct tqparent later, so store it
tqparent = WidgetFactory::widgetOfContainer( widgets.first()->tqparentWidget() );
tqparent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() );
// Now calculate the position where the tqlayout-meta-widget should
// be placed and connect to widgetDestroyed() signals of the
// widgets to get informed if one gets deleted to be able to
@ -158,17 +158,17 @@ bool Layout::prepareLayout( bool &needMove, bool &needRetqparent )
return false;
for ( TQWidget *w = widgets.first(); w; w = widgets.next() )
w->raise();
needMove = !tqlayoutBase;
needRetqparent = needMove || tqlayoutBase->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING );
if ( !tqlayoutBase ) {
needMove = !layoutBase;
needRetqparent = needMove || layoutBase->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING );
if ( !layoutBase ) {
if ( !useSplitter )
tqlayoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ),
layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ),
WidgetFactory::containerOfWidget( tqparent ) );
else
tqlayoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ),
layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ),
WidgetFactory::containerOfWidget( tqparent ) );
} else {
WidgetFactory::deleteLayout( tqlayoutBase );
WidgetFactory::deleteLayout( layoutBase );
}
return true;
@ -177,21 +177,21 @@ bool Layout::prepareLayout( bool &needMove, bool &needRetqparent )
void Layout::finishLayout( bool needMove, TQLayout *tqlayout )
{
if ( needMove )
tqlayoutBase->move( startPoint );
TQRect g( TQRect( tqlayoutBase->pos(), tqlayoutBase->size() ) );
if ( WidgetFactory::tqlayoutType( tqlayoutBase->tqparentWidget() ) == WidgetFactory::NoLayout && !isBreak )
tqlayoutBase->adjustSize();
layoutBase->move( startPoint );
TQRect g( TQRect( layoutBase->pos(), layoutBase->size() ) );
if ( WidgetFactory::layoutType( layoutBase->parentWidget() ) == WidgetFactory::NoLayout && !isBreak )
layoutBase->adjustSize();
else if ( isBreak )
tqlayoutBase->setGeometry( oldGeometry );
layoutBase->setGeometry( oldGeometry );
oldGeometry = g;
tqlayoutBase->show();
layoutBase->show();
tqlayout->activate();
formWindow->insertWidget( tqlayoutBase );
formWindow->selectWidget( TQT_TQOBJECT(tqlayoutBase) );
TQString n = tqlayoutBase->name();
formWindow->insertWidget( layoutBase );
formWindow->selectWidget( TQT_TQOBJECT(layoutBase) );
TQString n = layoutBase->name();
if ( n.tqfind( "qt_dead_widget_" ) != -1 ) {
n.remove( 0, TQString( "qt_dead_widget_" ).length() );
tqlayoutBase->setName( n );
layoutBase->setName( n );
}
}
@ -206,15 +206,15 @@ void Layout::undoLayout()
it.key()->reparent( WidgetFactory::containerOfWidget( tqparent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) );
it.key()->resize( ( *it ).size() );
}
formWindow->selectWidget( TQT_TQOBJECT(tqlayoutBase), false );
WidgetFactory::deleteLayout( tqlayoutBase );
if ( tqparent != tqlayoutBase && !tqlayoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) {
tqlayoutBase->hide();
TQString n = tqlayoutBase->name();
formWindow->selectWidget( TQT_TQOBJECT(layoutBase), false );
WidgetFactory::deleteLayout( layoutBase );
if ( tqparent != layoutBase && !layoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) {
layoutBase->hide();
TQString n = layoutBase->name();
n.prepend( "qt_dead_widget_" );
tqlayoutBase->setName( n );
layoutBase->setName( n );
} else {
tqlayoutBase->setGeometry( oldGeometry );
layoutBase->setGeometry( oldGeometry );
}
if ( widgets.first() )
formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) );
@ -230,33 +230,33 @@ void Layout::breakLayout()
for ( w = widgets.first(); w; w = widgets.next() )
rects.insert( w, w->tqgeometry() );
}
WidgetFactory::deleteLayout( tqlayoutBase );
bool needRetqparent = qstrcmp( tqlayoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
qstrcmp( tqlayoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 ||
( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( tqlayoutBase )) ) ) &&
tqlayoutBase != formWindow->mainContainer() );
bool needResize = qstrcmp( tqlayoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0;
WidgetFactory::deleteLayout( layoutBase );
bool needRetqparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 ||
( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( layoutBase )) ) ) &&
layoutBase != formWindow->mainContainer() );
bool needResize = qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0;
bool add = geometries.isEmpty();
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( needRetqparent )
w->reparent( tqlayoutBase->tqparentWidget(), 0,
tqlayoutBase->pos() + w->pos(), true );
w->reparent( layoutBase->parentWidget(), 0,
layoutBase->pos() + w->pos(), true );
if ( needResize ) {
TQMap<TQWidget*, TQRect>::Iterator it = rects.tqfind( w );
if ( it != rects.end() )
w->setGeometry( TQRect( tqlayoutBase->pos() + (*it).topLeft(), (*it).size() ) );
w->setGeometry( TQRect( layoutBase->pos() + (*it).topLeft(), (*it).size() ) );
}
if ( add )
geometries.insert( w, TQRect( w->pos(), w->size() ) );
}
if ( needRetqparent ) {
tqlayoutBase->hide();
tqparent = tqlayoutBase->tqparentWidget();
TQString n = tqlayoutBase->name();
layoutBase->hide();
tqparent = layoutBase->parentWidget();
TQString n = layoutBase->name();
n.prepend( "qt_dead_widget_" );
tqlayoutBase->setName( n );
layoutBase->setName( n );
} else {
tqparent = tqlayoutBase;
tqparent = layoutBase;
}
if ( widgets.first() && widgets.first()->isVisibleTo( formWindow ) )
formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) );
@ -303,11 +303,11 @@ void HorizontalLayout::doLayout()
if ( !prepareLayout( needMove, needRetqparent ) )
return;
TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::HBox );
TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) )
w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), false );
if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 )
tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() );
@ -319,8 +319,8 @@ void HorizontalLayout::doLayout()
w->show();
}
if ( tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
( (TQSplitter*)tqlayoutBase )->setOrientation( Qt::Horizontal );
if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal );
finishLayout( needMove, tqlayout );
}
@ -367,11 +367,11 @@ void VerticalLayout::doLayout()
if ( !prepareLayout( needMove, needRetqparent ) )
return;
TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::VBox );
TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) )
w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), false );
if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 )
tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() );
@ -383,8 +383,8 @@ void VerticalLayout::doLayout()
w->show();
}
if ( tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
( (TQSplitter*)tqlayoutBase )->setOrientation( Qt::Vertical );
if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical );
finishLayout( needMove, tqlayout );
}
@ -733,7 +733,7 @@ void GridLayout::doLayout()
if ( !prepareLayout( needMove, needRetqparent ) )
return;
QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::Grid );
QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
if ( !grid )
buildGrid();
@ -742,8 +742,8 @@ void GridLayout::doLayout()
int r, c, rs, cs;
for ( w = widgets.first(); w; w = widgets.next() ) {
if ( grid->locateWidget( w, r, c, rs, cs) ) {
if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) )
w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), false );
if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
if ( rs * cs == 1 ) {
tqlayout->addWidget( w, r, c, w->inherits( "Spacer" ) ? ( (Spacer*)w )->tqalignment() : 0 );
} else {
@ -846,7 +846,7 @@ void Spacer::paintEvent( TQPaintEvent * )
void Spacer::resizeEvent( TQResizeEvent* e)
{
TQWidget::resizeEvent( e );
if ( !tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout )
if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
sh = size();
}
@ -912,7 +912,7 @@ TQSize Spacer::tqsizeHint() const
void Spacer::setSizeHint( const TQSize &s )
{
sh = s;
if ( !tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout )
if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
resize( tqsizeHint() );
updateGeometry();
}
@ -932,7 +932,7 @@ void Spacer::setOrientation( Qt::Orientation o )
setSizeType( st );
if ( interactive ) {
sh = TQSize( sh.height(), sh.width() );
if (!tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout )
if (!parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
resize( height(), width() );
}
updateMask();

4
kommander/editor/layout.h
Unescape View File

@ -51,7 +51,7 @@ protected:
TQWidget *tqparent;
TQPoint startPoint;
TQMap<TQGuardedPtr<TQWidget>, TQRect> geometries;
TQWidget *tqlayoutBase;
TQWidget *layoutBase;
FormWindow *formWindow;
TQRect oldGeometry;
bool isBreak;
@ -160,7 +160,7 @@ class QDesignerGridLayout : public TQGridLayout
TQ_OBJECT
public:
QDesignerGridLayout( TQWidget *tqparent ) : TQGridLayout( tqparent ){};
QDesignerGridLayout( TQLayout *tqparentLayout ) : TQGridLayout( tqparentLayout ){};
QDesignerGridLayout( TQLayout *parentLayout ) : TQGridLayout( parentLayout ){};
void addWidget( TQWidget *, int row, int col, int align = 0 );
void addMultiCellWidget( TQWidget *, int fromRow, int toRow,

2
kommander/editor/listeditor.ui
Unescape View File

@ -143,5 +143,5 @@
<slot>renameItem()</slot>
</Q_SLOTS>
<pixmapinproject/>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

54
kommander/editor/mainwindow.cpp
Unescape View File

@ -143,9 +143,9 @@ MainWindow::MainWindow(bool asClient)
setupMDI();
setupFileActions();
setupEditActions();
tqlayoutToolBar = new KToolBar(this, "Layout");
((KToolBar *) tqlayoutToolBar)->setFullSize(false);
addToolBar(tqlayoutToolBar, i18n("Layout"));
layoutToolBar = new KToolBar(this, "Layout");
((KToolBar *) layoutToolBar)->setFullSize(false);
addToolBar(layoutToolBar, i18n("Layout"));
setupToolActions();
setupLayoutActions();
setupWorkspace();
@ -171,8 +171,8 @@ MainWindow::MainWindow(bool asClient)
connect(kapp->clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged()));
clipboardChanged();
tqlayoutChilds = false;
tqlayoutSelected = false;
layoutChilds = false;
layoutSelected = false;
breakLayout = false;
backPix = true;
@ -274,7 +274,7 @@ void MainWindow::setupHierarchyView()
"<p>The Object Explorer provides an overview of the relationships "
"between the widgets in a form. You can use the clipboard functions using "
"a context menu for each item in the view. It is also useful for selecting widgets "
"in forms that have complex tqlayouts.</p>"
"in forms that have complex layouts.</p>"
"<p>The columns can be resized by dragging the separator in the list's header.</p>"
"<p>The second tab shows all the form's slots, class variables, includes, etc.</p>"));
}
@ -596,7 +596,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
while (w) {
if (w->inherits("PropertyList"))
break;
w = w->tqparentWidget(true);
w = w->parentWidget(true);
}
if (w) {
propertyEditor->propertyList()->showCurrentWhatsThis();
@ -634,8 +634,8 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
o->tqparent() && o->tqparent()->inherits("QDesignerToolBar"))) {
TQWidget *w = (TQWidget*)o;
if (w->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || w->inherits("QDesignerToolBarSeparator"))
w = w->tqparentWidget();
TQWidget *pw = w->tqparentWidget();
w = w->parentWidget();
TQWidget *pw = w->parentWidget();
while (pw) {
if (pw->inherits("FormWindow")) {
((FormWindow*)pw)->emitShowProperties(TQT_TQOBJECT(w));
@ -643,7 +643,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
return !o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && !o->inherits(TQMENUBAR_OBJECT_NAME_STRING) &&
!o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) && !o->inherits("QDesignerToolBarSeparator");
}
pw = pw->tqparentWidget();
pw = pw->parentWidget();
}
}
if (o && (o->inherits("QDesignerToolBar") || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING))
@ -752,7 +752,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
case TQEvent::Move:
if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator"))
break;
if (WidgetFactory::tqlayoutType((TQWidget*)o->tqparent()) != WidgetFactory::NoLayout) {
if (WidgetFactory::layoutType((TQWidget*)o->tqparent()) != WidgetFactory::NoLayout) {
((FormWindow*)w)->updateSelection((TQWidget*)o);
if (e->type() != TQEvent::Resize)
((FormWindow*)w)->updateChildSelections((TQWidget*)o);
@ -1320,8 +1320,8 @@ void MainWindow::clipboardChanged()
void MainWindow::selectionChanged()
{
tqlayoutChilds = false;
tqlayoutSelected = false;
layoutChilds = false;
layoutSelected = false;
breakLayout = false;
if (!formWindow()) {
actionEditCut->setEnabled(false);
@ -1358,7 +1358,7 @@ void MainWindow::selectionChanged()
int unlaidout = 0;
int laidout = 0;
for (TQWidget *w = widgets.first(); w; w = widgets.next()) {
if (!w->tqparentWidget() || WidgetFactory::tqlayoutType(w->tqparentWidget()) == WidgetFactory::NoLayout)
if (!w->parentWidget() || WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout)
unlaidout++;
else
laidout++;
@ -1370,27 +1370,27 @@ void MainWindow::selectionChanged()
actionEditGridLayout->setEnabled(unlaidout > 1);
actionEditBreakLayout->setEnabled(laidout > 0);
actionEditAdjustSize->setEnabled(laidout > 0);
tqlayoutSelected = unlaidout > 1;
layoutSelected = unlaidout > 1;
breakLayout = laidout > 0;
} else if (selectedWidgets == 1) {
TQWidget *w = widgets.first();
bool isContainer = WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w)))) ||
w == formWindow()->mainContainer();
actionEditAdjustSize->setEnabled(!w->tqparentWidget() ||
WidgetFactory::tqlayoutType(w->tqparentWidget()) == WidgetFactory::NoLayout);
actionEditAdjustSize->setEnabled(!w->parentWidget() ||
WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout);
if (!isContainer) {
actionEditHLayout->setEnabled(false);
actionEditVLayout->setEnabled(false);
actionEditGridLayout->setEnabled(false);
if (w->tqparentWidget() && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout) {
if (w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) {
actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w)));
breakLayout = true;
} else {
actionEditBreakLayout->setEnabled(false);
}
} else {
if (WidgetFactory::tqlayoutType(w) == WidgetFactory::NoLayout) {
if (WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) {
if (!formWindow()->hasInsertedChildren(w)) {
actionEditHLayout->setEnabled(false);
actionEditVLayout->setEnabled(false);
@ -1401,9 +1401,9 @@ void MainWindow::selectionChanged()
actionEditVLayout->setEnabled(true);
actionEditGridLayout->setEnabled(true);
actionEditBreakLayout->setEnabled(false);
tqlayoutChilds = true;
layoutChilds = true;
}
if (w->tqparentWidget() && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout) {
if (w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) {
actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w)));
breakLayout = true;
}
@ -1418,7 +1418,7 @@ void MainWindow::selectionChanged()
} else if (selectedWidgets == 0 && formWindow()) {
actionEditAdjustSize->setEnabled(true);
TQWidget *w = formWindow()->mainContainer();
if (WidgetFactory::tqlayoutType(w) == WidgetFactory::NoLayout) {
if (WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) {
if (!formWindow()->hasInsertedChildren(w)) {
actionEditHLayout->setEnabled(false);
actionEditVLayout->setEnabled(false);
@ -1429,7 +1429,7 @@ void MainWindow::selectionChanged()
actionEditVLayout->setEnabled(true);
actionEditGridLayout->setEnabled(true);
actionEditBreakLayout->setEnabled(false);
tqlayoutChilds = true;
layoutChilds = true;
}
} else {
actionEditHLayout->setEnabled(false);
@ -1836,13 +1836,13 @@ void MainWindow::setModified(bool b, TQWidget *window)
((FormWindow *) w)->modificationChanged(b);
return;
}
w = w->tqparentWidget(true);
w = w->parentWidget(true);
if (w->inherits("FormWindow"))
{
((FormWindow *) w)->modificationChanged(b);
return;
}
w = w->tqparentWidget(true);
w = w->parentWidget(true);
}
}
@ -1869,14 +1869,14 @@ void MainWindow::formNameChanged(FormWindow*)
int MainWindow::currentLayoutDefaultSpacing() const
{
if (((MainWindow*)this)->formWindow())
return ((MainWindow*)this)->formWindow()->tqlayoutDefaultSpacing();
return ((MainWindow*)this)->formWindow()->layoutDefaultSpacing();
return BOXLAYOUT_DEFAULT_SPACING;
}
int MainWindow::currentLayoutDefaultMargin() const
{
if (((MainWindow*)this)->formWindow())
return ((MainWindow*)this)->formWindow()->tqlayoutDefaultMargin();
return ((MainWindow*)this)->formWindow()->layoutDefaultMargin();
return BOXLAYOUT_DEFAULT_MARGIN;
}

4
kommander/editor/mainwindow.h
Unescape View File

@ -256,7 +256,7 @@ private:
TQWorkspace *qworkspace;
KMenuBar *menubar;
FormWindow *lastActiveFormWindow;
bool breakLayout, tqlayoutChilds, tqlayoutSelected;
bool breakLayout, layoutChilds, layoutSelected;
TQPoint grd;
bool sGrid, snGrid;
bool restoreConfig;
@ -280,7 +280,7 @@ private:
TQPopupMenu *rmbFormWindow;
TQPopupMenu *windowMenu, *fileMenu;
TQToolBar *tqlayoutToolBar;
TQToolBar *layoutToolBar;
KToolBar *fileTb;
Preferences *prefDia;

80
kommander/editor/mainwindowactions.cpp
Unescape View File

@ -225,14 +225,14 @@ void MainWindow::setupLayoutActions()
actionEditGridLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out in a Grid"));
actionEditGridLayout->setEnabled(false);
actionEditSplitHorizontal = new KAction(i18n("Lay OutQt::Horizontally in Splitter"), createIconSet("editvtqlayoutsplit.xpm"),
actionEditSplitHorizontal = new KAction(i18n("Lay OutQt::Horizontally in Splitter"), createIconSet("editvlayoutsplit.xpm"),
KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontalSplit()), actionCollection(),
"edit_split_h");
actionEditSplitHorizontal->setToolTip(i18n("Lays out the selected widgets horizontally in a splitter"));
actionEditSplitHorizontal->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Horizontally in Splitter"));
actionEditSplitHorizontal->setEnabled(false);
actionEditSplitVertical = new KAction(i18n("Lay OutQt::Vertically in Splitter"), createIconSet("edithtqlayoutsplit.xpm"),
actionEditSplitVertical = new KAction(i18n("Lay OutQt::Vertically in Splitter"), createIconSet("edithlayoutsplit.xpm"),
KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutVerticalSplit()), actionCollection(),
"edit_split_v");
actionEditSplitVertical->setToolTip(i18n("Lays out the selected widgets vertically in a splitter"));
@ -255,17 +255,17 @@ void MainWindow::setupLayoutActions()
"or double click to keep the tool selected.").tqarg(WidgetDatabase::toolTip(id)).
tqarg(WidgetDatabase::whatsThis(id)).tqarg(WidgetDatabase::toolTip(id)));
TQWhatsThis::add(tqlayoutToolBar, i18n("<b>The Layout toolbar</b>%1").tqarg(toolbarHelp));
actionEditAdjustSize->plug(tqlayoutToolBar);
tqlayoutToolBar->addSeparator();
actionEditHLayout->plug(tqlayoutToolBar);
actionEditVLayout->plug(tqlayoutToolBar);
actionEditGridLayout->plug(tqlayoutToolBar);
actionEditSplitHorizontal->plug(tqlayoutToolBar);
actionEditSplitVertical->plug(tqlayoutToolBar);
actionEditBreakLayout->plug(tqlayoutToolBar);
tqlayoutToolBar->addSeparator();
a->plug(tqlayoutToolBar);
TQWhatsThis::add(layoutToolBar, i18n("<b>The Layout toolbar</b>%1").tqarg(toolbarHelp));
actionEditAdjustSize->plug(layoutToolBar);
layoutToolBar->addSeparator();
actionEditHLayout->plug(layoutToolBar);
actionEditVLayout->plug(layoutToolBar);
actionEditGridLayout->plug(layoutToolBar);
actionEditSplitHorizontal->plug(layoutToolBar);
actionEditSplitVertical->plug(layoutToolBar);
actionEditBreakLayout->plug(layoutToolBar);
layoutToolBar->addSeparator();
a->plug(layoutToolBar);
TQPopupMenu *menu = new TQPopupMenu(this, "Layout");
menuBar()->insertItem(i18n("&Layout"), menu);
@ -893,13 +893,13 @@ void MainWindow::editPaste()
if (l.count() == 1)
{
w = l.first();
if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout ||
if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout ||
(!WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::
classNameOf(TQT_TQOBJECT(w)))) && w != formWindow()->mainContainer()))
w = formWindow()->mainContainer();
}
if (w && WidgetFactory::tqlayoutType(w) == WidgetFactory::NoLayout)
if (w && WidgetFactory::layoutType(w) == WidgetFactory::NoLayout)
{
formWindow()->paste(tqApp->clipboard()->text(), WidgetFactory::containerOfWidget(w));
hierarchyView->widgetInserted(0);
@ -945,42 +945,42 @@ void MainWindow::editAdjustSize()
void MainWindow::editLayoutHorizontal()
{
if (tqlayoutChilds)
if (layoutChilds)
editLayoutContainerHorizontal();
else if (tqlayoutSelected && formWindow())
formWindow()->tqlayoutHorizontal();
else if (layoutSelected && formWindow())
formWindow()->layoutHorizontal();
}
void MainWindow::editLayoutVertical()
{
if (tqlayoutChilds)
if (layoutChilds)
editLayoutContainerVertical();
else if (tqlayoutSelected && formWindow())
formWindow()->tqlayoutVertical();
else if (layoutSelected && formWindow())
formWindow()->layoutVertical();
}
void MainWindow::editLayoutHorizontalSplit()
{
if (tqlayoutChilds)
if (layoutChilds)
; // no way to do that
else if (tqlayoutSelected && formWindow())
formWindow()->tqlayoutHorizontalSplit();
else if (layoutSelected && formWindow())
formWindow()->layoutHorizontalSplit();
}
void MainWindow::editLayoutVerticalSplit()
{
if (tqlayoutChilds)
if (layoutChilds)
; // no way to do that
else if (tqlayoutSelected && formWindow())
formWindow()->tqlayoutVerticalSplit();
else if (layoutSelected && formWindow())
formWindow()->layoutVerticalSplit();
}
void MainWindow::editLayoutGrid()
{
if (tqlayoutChilds)
if (layoutChilds)
editLayoutContainerGrid();
else if (tqlayoutSelected && formWindow())
formWindow()->tqlayoutGrid();
else if (layoutSelected && formWindow())
formWindow()->layoutGrid();
}
void MainWindow::editLayoutContainerVertical()
@ -992,7 +992,7 @@ void MainWindow::editLayoutContainerVertical()
if (l.count() == 1)
w = l.first();
if (w)
formWindow()->tqlayoutVerticalContainer(w);
formWindow()->layoutVerticalContainer(w);
}
void MainWindow::editLayoutContainerHorizontal()
@ -1004,7 +1004,7 @@ void MainWindow::editLayoutContainerHorizontal()
if (l.count() == 1)
w = l.first();
if (w)
formWindow()->tqlayoutHorizontalContainer(w);
formWindow()->layoutHorizontalContainer(w);
}
void MainWindow::editLayoutContainerGrid()
@ -1016,7 +1016,7 @@ void MainWindow::editLayoutContainerGrid()
if (l.count() == 1)
w = l.first();
if (w)
formWindow()->tqlayoutGridContainer(w);
formWindow()->layoutGridContainer(w);
}
@ -1029,8 +1029,8 @@ void MainWindow::editBreakLayout()
TQWidget *w = formWindow()->mainContainer();
if (formWindow()->currentWidget())
w = formWindow()->currentWidget();
if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout ||
w->tqparentWidget() && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout)
if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout ||
w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout)
{
formWindow()->breakLayout(w);
return;
@ -1040,9 +1040,9 @@ void MainWindow::editBreakLayout()
TQWidgetList widgets = formWindow()->selectedWidgets();
for (w = widgets.first(); w; w = widgets.next())
{
if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout ||
w->tqparentWidget()
&& WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout)
if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout ||
w->parentWidget()
&& WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout)
break;
}
if (w)
@ -1053,8 +1053,8 @@ void MainWindow::editBreakLayout()
}
w = formWindow()->mainContainer();
if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout ||
w->tqparentWidget() && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout)
if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout ||
w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout)
{
formWindow()->breakLayout(w);
}

4
kommander/editor/metadatabase.cpp
Unescape View File

@ -270,7 +270,7 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing )
r->spacing = spacing;
TQLayout * tqlayout = 0;
WidgetFactory::tqlayoutType( (TQWidget*)o, tqlayout );
WidgetFactory::layoutType( (TQWidget*)o, tqlayout );
if ( tqlayout )
tqlayout->setSpacing( spacing );
}
@ -306,7 +306,7 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
r->margin = margin;
TQLayout * tqlayout = 0;
WidgetFactory::tqlayoutType( (TQWidget*)o, tqlayout );
WidgetFactory::layoutType( (TQWidget*)o, tqlayout );
if ( margin < 1 )
margin = 1;
if ( tqlayout )

2
kommander/editor/newform.ui
Unescape View File

@ -206,5 +206,5 @@
<slot access="protected">itemChanged( TQIconViewItem * )</slot>
<slot access="protected">projectChanged( const QString &amp; )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/editor/orderindicator.cpp
Unescape View File

@ -72,7 +72,7 @@ void OrderIndicator::setOrder( int i, TQWidget* wid )
void OrderIndicator::reposition()
{
TQPoint p =tqparentWidget()->mapFromGlobal( widget->mapToGlobal( widget->rect().topLeft() ) );
TQPoint p =parentWidget()->mapFromGlobal( widget->mapToGlobal( widget->rect().topLeft() ) );
move( p - TQPoint( width()/3, height()/3 ) );
}

2
kommander/editor/paletteeditor.ui
Unescape View File

@ -509,7 +509,7 @@
<slot access="protected">onChooseMainColor()</slot>
<slot access="protected">paletteSelected(int)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>styledbutton.h</includehint>
<includehint>styledbutton.h</includehint>

4
kommander/editor/paletteeditoradvanced.ui
Unescape View File

@ -41,7 +41,7 @@
<bool>true</bool>
</property>
<property name="whatsThis" stdset="0">
<string>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the current widget or form's palette.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget tqlayouts in the preview section.&lt;/p&gt;</string>
<string>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the current widget or form's palette.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget layouts in the preview section.&lt;/p&gt;</string>
</property>
<vbox>
<property name="name">
@ -757,7 +757,7 @@
<slot access="protected">paletteSelected(int)</slot>
<slot>showHelp()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>styledbutton.h</includehint>
<includehint>styledbutton.h</includehint>

48
kommander/editor/pics/images.h
Unescape View File

@ -4717,8 +4717,8 @@ static const unsigned char small_editgrid_png_data[] = {
0x60,0x82
};
static const unsigned int small_edithtqlayout_png_len = 706;
static const unsigned char small_edithtqlayout_png_data[] = {
static const unsigned int small_edithlayout_png_len = 706;
static const unsigned char small_edithlayout_png_data[] = {
0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@ -4772,8 +4772,8 @@ static const unsigned char small_edithtqlayout_png_data[] = {
0x4e,0x44,0xae,0x42,0x60,0x82
};
static const unsigned int small_edithtqlayoutsplit_png_len = 809;
static const unsigned char small_edithtqlayoutsplit_png_data[] = {
static const unsigned int small_edithlayoutsplit_png_len = 809;
static const unsigned char small_edithlayoutsplit_png_data[] = {
0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@ -4957,8 +4957,8 @@ static const unsigned char small_editslots_png_data[] = {
0xae,0x42,0x60,0x82
};
static const unsigned int small_editvtqlayout_png_len = 289;
static const unsigned char small_editvtqlayout_png_data[] = {
static const unsigned int small_editvlayout_png_len = 289;
static const unsigned char small_editvlayout_png_data[] = {
0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@ -4982,8 +4982,8 @@ static const unsigned char small_editvtqlayout_png_data[] = {
0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
};
static const unsigned int small_editvtqlayoutsplit_png_len = 355;
static const unsigned char small_editvtqlayoutsplit_png_data[] = {
static const unsigned int small_editvlayoutsplit_png_len = 355;
static const unsigned char small_editvlayoutsplit_png_data[] = {
0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@ -7784,8 +7784,8 @@ static const unsigned char small_disabled_editgrid_png_data[] = {
0x45,0x4e,0x44,0xae,0x42,0x60,0x82
};
static const unsigned int small_disabled_edithtqlayout_png_len = 601;
static const unsigned char small_disabled_edithtqlayout_png_data[] = {
static const unsigned int small_disabled_edithlayout_png_len = 601;
static const unsigned char small_disabled_edithlayout_png_data[] = {
0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@ -7831,8 +7831,8 @@ static const unsigned char small_disabled_edithtqlayout_png_data[] = {
0x35,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
};
static const unsigned int small_disabled_edithtqlayoutsplit_png_len = 754;
static const unsigned char small_disabled_edithtqlayoutsplit_png_data[] = {
static const unsigned int small_disabled_edithlayoutsplit_png_len = 754;
static const unsigned char small_disabled_edithlayoutsplit_png_data[] = {
0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@ -7958,8 +7958,8 @@ static const unsigned char small_disabled_editpaste_png_data[] = {
0x44,0xae,0x42,0x60,0x82
};
static const unsigned int small_disabled_editvtqlayout_png_len = 617;
static const unsigned char small_disabled_editvtqlayout_png_data[] = {
static const unsigned int small_disabled_editvlayout_png_len = 617;
static const unsigned char small_disabled_editvlayout_png_data[] = {
0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@ -8007,8 +8007,8 @@ static const unsigned char small_disabled_editvtqlayout_png_data[] = {
0x82
};
static const unsigned int small_disabled_editvtqlayoutsplit_png_len = 752;
static const unsigned char small_disabled_editvtqlayoutsplit_png_data[] = {
static const unsigned int small_disabled_editvlayoutsplit_png_len = 752;
static const unsigned char small_disabled_editvlayoutsplit_png_data[] = {
0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@ -10877,12 +10877,12 @@ static struct Embed {
{ 485, small_editcopy_png_data, "small/editcopy.png" },
{ 649, small_editcut_png_data, "small/editcut.png" },
{ 520, small_editgrid_png_data, "small/editgrid.png" },
{ 706, small_edithtqlayout_png_data, "small/edithtqlayout.png" },
{ 809, small_edithtqlayoutsplit_png_data, "small/edithtqlayoutsplit.png" },
{ 706, small_edithlayout_png_data, "small/edithtqlayout.png" },
{ 809, small_edithlayoutsplit_png_data, "small/edithlayoutsplit.png" },
{ 902, small_editpaste_png_data, "small/editpaste.png" },
{ 690, small_editslots_png_data, "small/editslots.png" },
{ 289, small_editvtqlayout_png_data, "small/editvtqlayout.png" },
{ 355, small_editvtqlayoutsplit_png_data, "small/editvtqlayoutsplit.png" },
{ 289, small_editvlayout_png_data, "small/editvtqlayout.png" },
{ 355, small_editvlayoutsplit_png_data, "small/editvlayoutsplit.png" },
{ 1408, small_exec_png_data, "small/exec.png" },
{ 313, small_filenew_png_data, "small/filenew.png" },
{ 681, small_fileopen_png_data, "small/fileopen.png" },
@ -10933,11 +10933,11 @@ static struct Embed {
{ 1126, small_disabled_editbreaklayout_png_data, "small/disabled/editbreaklayout.png" },
{ 931, small_disabled_editcopy_png_data, "small/disabled/editcopy.png" },
{ 735, small_disabled_editgrid_png_data, "small/disabled/editgrid.png" },
{ 601, small_disabled_edithtqlayout_png_data, "small/disabled/edithtqlayout.png" },
{ 754, small_disabled_edithtqlayoutsplit_png_data, "small/disabled/edithtqlayoutsplit.png" },
{ 601, small_disabled_edithlayout_png_data, "small/disabled/edithtqlayout.png" },
{ 754, small_disabled_edithlayoutsplit_png_data, "small/disabled/edithlayoutsplit.png" },
{ 901, small_disabled_editpaste_png_data, "small/disabled/editpaste.png" },
{ 617, small_disabled_editvtqlayout_png_data, "small/disabled/editvtqlayout.png" },
{ 752, small_disabled_editvtqlayoutsplit_png_data, "small/disabled/editvtqlayoutsplit.png" },
{ 617, small_disabled_editvlayout_png_data, "small/disabled/editvtqlayout.png" },
{ 752, small_disabled_editvlayoutsplit_png_data, "small/disabled/editvlayoutsplit.png" },
{ 587, small_disabled_filesave_png_data, "small/disabled/filesave.png" },
{ 531, small_disabled_redo_png_data, "small/disabled/redo.png" },
{ 1013, small_disabled_searchfind_png_data, "small/disabled/searchfind.png" },

4
kommander/editor/pixmapfunction.ui
Unescape View File

@ -84,10 +84,10 @@
<number>2</number>
</property>
<property>
<name>tqlayoutMargin</name>
<name>layoutMargin</name>
</property>
<property>
<name>tqlayoutSpacing</name>
<name>layoutSpacing</name>
</property>
<hbox>
<property stdset="1">

44
kommander/editor/propertyeditor.cpp
Unescape View File

@ -172,7 +172,7 @@ PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *
PropertyItem::~PropertyItem()
{
if ( resetButton )
delete resetButton->tqparentWidget();
delete resetButton->parentWidget();
resetButton = 0;
}
@ -337,7 +337,7 @@ void PropertyItem::setOpen( bool b )
void PropertyItem::showEditor()
{
createResetButton();
resetButton->tqparentWidget()->show();
resetButton->parentWidget()->show();
}
/*! Subclasses have to hide the editor of the item here
@ -346,7 +346,7 @@ void PropertyItem::showEditor()
void PropertyItem::hideEditor()
{
createResetButton();
resetButton->tqparentWidget()->hide();
resetButton->parentWidget()->hide();
}
/*! This is called to init the value of the item. Reimplement in
@ -389,7 +389,7 @@ TQString PropertyItem::name() const
void PropertyItem::createResetButton()
{
if ( resetButton ) {
resetButton->tqparentWidget()->lower();
resetButton->parentWidget()->lower();
return;
}
TQHBox *hbox = new TQHBox( listview->viewport() );
@ -439,8 +439,8 @@ void PropertyItem::placeEditor( TQWidget *w )
r = TQRect( listview->viewportToContents( r.topLeft() ), r.size() );
w->resize( r.size() );
listview->moveChild( w, r.x(), r.y() );
resetButton->tqparentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
listview->moveChild( resetButton->tqparentWidget(), r.x() + r.width() - 8, r.y() );
resetButton->parentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() );
resetButton->setFixedHeight( r.height() - 3 );
}
@ -2498,16 +2498,16 @@ static TQVariant::Type type_to_variant( const TQString &s )
}
#ifndef TQT_NO_SQL
static bool tqparent_is_data_aware( TQObject *o )
static bool parent_is_data_aware( TQObject *o )
{
if ( !o->inherits( TQWIDGET_OBJECT_NAME_STRING ) )
return false;
TQWidget *w = (TQWidget*)o;
TQWidget *p = w->tqparentWidget();
TQWidget *p = w->parentWidget();
while ( p && !p->isTopLevel() ) {
if ( p->inherits( "QDesignerDataBrowser" ) || p->inherits( "QDesignerDataView" ) )
return true;
p = p->tqparentWidget();
p = p->parentWidget();
}
return false;
}
@ -2527,10 +2527,10 @@ void PropertyList::setupProperties()
TQMap<TQString, bool> unique;
TQObject *w = editor->widget();
TQStringList valueSet;
bool tqparentHasLayout =
bool parentHasLayout =
w->isWidgetType() &&
!editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)w) ) && ( (TQWidget*)w )->tqparentWidget() &&
WidgetFactory::tqlayoutType( ( (TQWidget*)w )->tqparentWidget() ) != WidgetFactory::NoLayout;
!editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)w) ) && ( (TQWidget*)w )->parentWidget() &&
WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
const TQMetaProperty* p =
editor->widget()->tqmetaObject()->
@ -2573,7 +2573,7 @@ void PropertyList::setupProperties()
continue;
if ( qstrcmp( p->name(), "baseSize" ) == 0 )
continue;
if ( tqparentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 )
if ( parentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 )
continue;
if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || w->inherits( "Spacer" ) ) {
if ( qstrcmp( p->name(), "sizePolicy" ) == 0 )
@ -2679,7 +2679,7 @@ void PropertyList::setupProperties()
TQStringList lst;
for ( uint i = 0; i < l.count(); ++i ) {
TQString k = l.at( i );
// filter out enum-tqmasks
// filter out enum-masks
if ( k[0] == 'M' && k[1].category() == TQChar::Letter_Uppercase )
continue;
lst << l.at( i );
@ -2703,11 +2703,11 @@ void PropertyList::setupProperties()
}
if ( !w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && !w->inherits( "QDesignerMenuBar" ) && !w->inherits( "QDesignerToolBar" ) &&
w->isWidgetType() && WidgetFactory::tqlayoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) {
item = new PropertyIntItem( this, item, 0, "tqlayoutSpacing", true );
w->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) {
item = new PropertyIntItem( this, item, 0, "layoutSpacing", true );
setPropertyValue( item );
item->setChanged( true );
item = new PropertyIntItem( this, item, 0, "tqlayoutMargin", true );
item = new PropertyIntItem( this, item, 0, "layoutMargin", true );
setPropertyValue( item );
item->setChanged( true );
}
@ -2727,7 +2727,7 @@ void PropertyList::setupProperties()
#ifndef TQT_NO_SQL
if ( !editor->widget()->inherits( TQDATATABLE_OBJECT_NAME_STRING ) && !editor->widget()->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) &&
!editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) && tqparent_is_data_aware( editor->widget() ) ) {
!editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) && parent_is_data_aware( editor->widget() ) ) {
item = new PropertyDatabaseItem( this, item, 0, "database", editor->formWindow()->mainContainer() != w );
setPropertyValue( item );
if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) )
@ -3084,9 +3084,9 @@ void PropertyList::setPropertyValue( PropertyItem *i )
i->setValue( TQVariant( true, 0 ) );
else
i->setValue( TQVariant( false, 0 ) );
} else if ( i->name() == "tqlayoutSpacing" ) {
} else if ( i->name() == "layoutSpacing" ) {
( (PropertyIntItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) );
} else if ( i->name() == "tqlayoutMargin" ) {
} else if ( i->name() == "layoutMargin" ) {
( (PropertyIntItem*)i )->setValue( MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) );
} else if ( i->name() == "toolTip" || i->name() == "whatsThis" || i->name() == "database" || i->name() == "frameworkCode" ) {
i->setValue( MetaDataBase::fakeProperty( editor->widget(), i->name() ) );
@ -3563,11 +3563,11 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw )
#endif
if ( w && w == wid ) {
bool ret = true;
if ( wid->isWidgetType() && WidgetFactory::tqlayoutType( (TQWidget*)wid ) != WidgetFactory::NoLayout ) {
if ( wid->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)wid ) != WidgetFactory::NoLayout ) {
TQListViewItemIterator it( listview );
ret = false;
while ( it.current() ) {
if ( it.current()->text( 0 ) == "tqlayoutSpacing" || it.current()->text( 0 ) == "tqlayoutMargin" ) {
if ( it.current()->text( 0 ) == "layoutSpacing" || it.current()->text( 0 ) == "layoutMargin" ) {
ret = true;
break;
}

48
kommander/editor/resource.cpp
Unescape View File

@ -290,9 +290,9 @@ bool Resource::load( FormFile *ff, TQIODevice* dev )
metaInfo.license = e.firstChild().toText().data();
} else if ( e.tagName() == "exportmacro" ) {
exportMacro = e.firstChild().toText().data();
} else if ( e.tagName() == "tqlayoutdefaults" ) {
formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", TQString::number( formwindow->tqlayoutDefaultSpacing() ) ).toInt() );
formwindow->setLayoutDefaultMargin( e.attribute( "margin", TQString::number( formwindow->tqlayoutDefaultMargin() ) ).toInt() );
} else if ( e.tagName() == "layoutdefaults" ) {
formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", TQString::number( formwindow->layoutDefaultSpacing() ) ).toInt() );
formwindow->setLayoutDefaultMargin( e.attribute( "margin", TQString::number( formwindow->layoutDefaultMargin() ) ).toInt() );
}
e = e.nextSibling().toElement();
@ -473,14 +473,14 @@ TQString Resource::copy()
TQWidgetList widgets = formwindow->selectedWidgets();
TQWidgetList tmp( widgets );
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
TQWidget *p = w->tqparentWidget();
TQWidget *p = w->parentWidget();
bool save = true;
while ( p ) {
if ( tmp.tqfindRef( p ) != -1 ) {
save = false;
break;
}
p = p->tqparentWidget();
p = p->parentWidget();
}
if ( save )
saveObject( TQT_TQOBJECT(w), 0, ts, 0 );
@ -940,8 +940,8 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
if ( !obj->inherits( TQSPLITTER_OBJECT_NAME_STRING ) &&
WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) &&
obj->isWidgetType() &&
WidgetFactory::tqlayoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) {
WidgetFactory::LayoutType lay = WidgetFactory::tqlayoutType( (TQWidget*)obj, tqlayout );
WidgetFactory::layoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) {
WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, tqlayout );
switch ( lay ) {
case WidgetFactory::HBox:
closeTag = makeIndent( indent ) + "</hbox>";
@ -1003,8 +1003,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
if ( changed.isEmpty() )
return;
bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->tqparentWidget() &&
WidgetFactory::tqlayoutType( ( (TQWidget*)w )->tqparentWidget() ) != WidgetFactory::NoLayout;
bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() &&
WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
TQStrList lst = w->tqmetaObject()->propertyNames( !w->inherits( "Spacer" ) );
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
@ -1085,7 +1085,7 @@ void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::T
void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant &value, TQVariant::Type t, TQTextStream &ts, int indent )
{
if ( name == "hAlign" || name =="vAlign" || name == "wordwrap" || name == "tqlayoutMargin" || name =="tqlayoutSpacing" )
if ( name == "hAlign" || name =="vAlign" || name == "wordwrap" || name == "layoutMargin" || name =="layoutSpacing" )
return;
int num, unum;
double dob;
@ -1108,9 +1108,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
num = value.toInt();
if ( w && w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {
if ( name == "spacing" )
num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) );
num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) );
else if ( name == "margin" )
num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) );
num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) );
}
ts << makeIndent( indent ) << "<number>" << TQString::number( num ) << "</number>" << endl;
break;
@ -1126,9 +1126,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
unum = value.toUInt();
if ( w && w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {
if ( name == "spacing" )
num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) );
num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) );
else if ( name == "margin" )
num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) );
num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) );
}
ts << makeIndent( indent ) << "<number>" << TQString::number( unum ) << "</number>" << endl;
break;
@ -1173,8 +1173,8 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
TQVariant v( value );
ts << makeIndent( indent ) << "<font>" << endl;
TQFont f( tqApp->font() );
if ( w && w->isWidgetType() && ((TQWidget*)w)->tqparentWidget() )
f = ((TQWidget*)w)->tqparentWidget()->font();
if ( w && w->isWidgetType() && ((TQWidget*)w)->parentWidget() )
f = ((TQWidget*)w)->parentWidget()->font();
TQFont f2( v.toFont() );
indent++;
if ( f.family() != f2.family() )
@ -1347,7 +1347,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL
if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
w = ( (TQMainWindow*)w )->centralWidget();
if ( tqlayout ) {
switch ( WidgetFactory::tqlayoutType( tqlayout ) ) {
switch ( WidgetFactory::layoutType( tqlayout ) ) {
case WidgetFactory::HBox:
( (TQHBoxLayout*)tqlayout )->addWidget( w );
break;
@ -1646,7 +1646,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
{
const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->tqfindProperty( prop, true ), true );
if ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {// no tqlayouts in metadatabase... (RS)
if ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {// no layouts in metadatabase... (RS)
if ( obj->inherits( "CustomWidget" ) ) {
MetaDataBase::CustomWidget *cw = ( (CustomWidget*)obj )->customWidget();
if ( cw && !cw->hasProperty( prop.latin1() ) && !p && prop != "toolTip" && prop != "whatsThis" )
@ -1658,8 +1658,8 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
TQVariant defVarient;
if ( e.tagName() == "font" ) {
TQFont f( tqApp->font() );
if ( obj->isWidgetType() && ( (TQWidget*)obj )->tqparentWidget() )
f = ( (TQWidget*)obj )->tqparentWidget()->font();
if ( obj->isWidgetType() && ( (TQWidget*)obj )->parentWidget() )
f = ( (TQWidget*)obj )->parentWidget()->font();
defVarient = TQVariant( f );
}
@ -1756,11 +1756,11 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
if ( obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {
if ( prop == "spacing" ) {
MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)obj ) )), v.toInt() );
MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) )), v.toInt() );
return;
}
if ( prop == "margin" ) {
MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)obj ) )), v.toInt() );
MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) )), v.toInt() );
return;
}
}
@ -2342,8 +2342,8 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
if ( !( exportMacro = MetaDataBase::exportMacro( TQT_TQOBJECT(formwindow->mainContainer()) ) ).isEmpty() )
ts << makeIndent( indent ) << "<exportmacro>" << exportMacro << "</exportmacro>" << endl;
if ( formwindow )
ts << makeIndent( indent ) << "<tqlayoutdefaults spacing=\"" << formwindow->tqlayoutDefaultSpacing()
<< "\" margin=\"" << formwindow->tqlayoutDefaultMargin() << "\"/>" << endl;
ts << makeIndent( indent ) << "<layoutdefaults spacing=\"" << formwindow->layoutDefaultSpacing()
<< "\" margin=\"" << formwindow->layoutDefaultMargin() << "\"/>" << endl;
}
TQColorGroup Resource::loadColorGroup( const TQDomElement &e )

12
kommander/editor/sizehandle.cpp
Unescape View File

@ -93,7 +93,7 @@ void SizeHandle::setWidget( TQWidget *w )
void SizeHandle::paintEvent( TQPaintEvent * )
{
if ( ( (FormWindow*)tqparentWidget() )->currentWidget() != widget )
if ( ( (FormWindow*)parentWidget() )->currentWidget() != widget )
return;
TQPainter p( this );
p.setPen( blue );
@ -115,8 +115,8 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
TQPoint rp = mapFromGlobal( e->globalPos() );
TQPoint d = oldPressPos - rp;
oldPressPos = rp;
TQPoint checkPos = widget->tqparentWidget()->mapFromGlobal( e->globalPos() );
TQRect pr = widget->tqparentWidget()->rect();
TQPoint checkPos = widget->parentWidget()->mapFromGlobal( e->globalPos() );
TQRect pr = widget->parentWidget()->rect();
// ##### move code around a bit to reduce duplicated code here
switch ( dir ) {
@ -216,7 +216,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
formWindow->sizePreview()->setGeometry( lg );
formWindow->sizePreview()->show();
formWindow->sizePreview()->raise();
if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
formWindow->updateChildSelections( widget );
}
@ -282,7 +282,7 @@ void WidgetSelection::setWidget( TQWidget *w, bool updateDict )
}
wid = w;
bool active = !wid->tqparentWidget() || WidgetFactory::tqlayoutType( wid->tqparentWidget() ) == WidgetFactory::NoLayout;
bool active = !wid->parentWidget() || WidgetFactory::layoutType( wid->parentWidget() ) == WidgetFactory::NoLayout;
for ( int i = SizeHandle::LeftTop; i <= SizeHandle::Left; ++i ) {
SizeHandle *h = handles[ i ];
if ( h ) {
@ -306,7 +306,7 @@ void WidgetSelection::updateGeometry()
if ( !wid )
return;
TQPoint p = wid->tqparentWidget()->mapToGlobal( wid->pos() );
TQPoint p = wid->parentWidget()->mapToGlobal( wid->pos() );
p = formWindow->mapFromGlobal( p );
TQRect r( p, wid->size() );

2
kommander/editor/styledbutton.cpp
Unescape View File

@ -252,7 +252,7 @@ void StyledButton::dragEnterEvent( TQDragEnterEvent *e )
void StyledButton::dragLeaveEvent( TQDragLeaveEvent * )
{
if ( hasFocus() )
tqparentWidget()->setFocus();
parentWidget()->setFocus();
}
void StyledButton::dragMoveEvent( TQDragMoveEvent *e )

2
kommander/editor/templates/Configuration_Dialog.ui
Unescape View File

@ -152,5 +152,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui
Unescape View File

@ -110,5 +110,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/editor/templates/Dialog_with_Buttons_(Right).ui
Unescape View File

@ -110,5 +110,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/editor/templates/Tab_Dialog.ui
Unescape View File

@ -134,5 +134,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

4
kommander/editor/widgetdatabase.cpp
Unescape View File

@ -89,7 +89,7 @@ WidgetDatabaseRecord::~WidgetDatabaseRecord()
one application doesn't make sense anyway and so you don't need more
than an instance of the widgetdatabase.
For creating widgets, tqlayouts, etc. see WidgetFactory.
For creating widgets, layouts, etc. see WidgetFactory.
*/
/*!
@ -355,7 +355,7 @@ void WidgetDatabase::setupDataBase( int id )
r->group = widgetGroup("Temp");
r->toolTip = i18n("Spacer");
r->whatsThis =
i18n("The Spacer provides horizontal and vertical spacing to be able to manipulate the behaviour of tqlayouts.");
i18n("The Spacer provides horizontal and vertical spacing to be able to manipulate the behaviour of layouts.");
append(r);
r = new WidgetDatabaseRecord;

66
kommander/editor/widgetfactory.cpp
Unescape View File

@ -123,9 +123,9 @@ FormWindow *find_formwindow( TQWidget *w )
for (;;) {
if ( w->inherits( "FormWindow" ) )
return (FormWindow*)w;
if ( !w->tqparentWidget() )
if ( !w->parentWidget() )
return 0;
w = w->tqparentWidget();
w = w->parentWidget();
}
}
@ -387,10 +387,10 @@ TQMap< int, TQStringList > *changedProperties = 0;
/*!
\class WidgetFactory widgetfactory.h
\brief Set of static functions for creating widgets, tqlayouts and do other stuff
\brief Set of static functions for creating widgets, layouts and do other stuff
The widget factory offers functions to create widgets, create and
delete tqlayouts find out other details - all based on the
delete layouts find out other details - all based on the
WidgetDatabase's data. So the functions that use ids use the same
ids as in the WidgetDatabase.
*/
@ -679,7 +679,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
if ( widget && !widget->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) &&
( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) ||
widget && widget->tqparentWidget() && widget->tqparentWidget()->inherits( "FormWindow" ) ) )
widget && widget->parentWidget() && widget->parentWidget()->inherits( "FormWindow" ) ) )
margin = MainWindow::self->currentLayoutDefaultMargin();
if ( !tqlayout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
@ -1262,7 +1262,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
TQWidget::tqlayout() of \a w or to 0 after the function call.
*/
WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w, TQLayout *&tqlayout )
WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tqlayout )
{
tqlayout = 0;
@ -1304,7 +1304,7 @@ WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w, TQLayout *&t
/*!
\overload
*/
WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQLayout *tqlayout )
WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *tqlayout )
{
if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
return HBox;
@ -1318,14 +1318,14 @@ WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQLayout *tqlayout )
/*!
\overload
*/
WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w )
WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w )
{
TQLayout *l = 0;
return tqlayoutType( w, l );
return layoutType( w, l );
}
TQWidget *WidgetFactory::tqlayoutParent( TQLayout *tqlayout )
TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout )
{
TQObject *o = TQT_TQOBJECT(tqlayout);
while ( o ) {
@ -1365,20 +1365,20 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w )
/*! Returns the actual designer widget of the container \a w. This is
normally \a w itself, but might be a tqparent or grand tqparent of \a w
(e.g. when working with a tabwidget and \a w is the container which
contains and tqlayouts childs, but the actual widget known to the
contains and layouts childs, but the actual widget known to the
designer is the tabwidget which is the tqparent of \a w. So this
function returns the tabwidget then.)
*/
TQWidget* WidgetFactory::widgetOfContainer( TQWidget *w )
{
if ( w->tqparentWidget() && w->tqparentWidget()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
w = w->tqparentWidget();
if ( w->parentWidget() && w->parentWidget()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
w = w->parentWidget();
while ( w ) {
if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ||
w && w->tqparentWidget() && w->tqparentWidget()->inherits( "FormWindow" ) )
w && w->parentWidget() && w->parentWidget()->inherits( "FormWindow" ) )
return w;
w = w->tqparentWidget();
w = w->parentWidget();
}
return w;
}
@ -1686,14 +1686,14 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
return TQVariant();
} else if ( propName == "frameworkCode" ) {
return TQVariant( true, 0 );
} else if ( propName == "tqlayoutMargin" ) {
} else if ( propName == "layoutMargin" ) {
if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
return TQVariant( 0 );
else if ( MainWindow::self->formWindow() )
return TQVariant( MainWindow::self->formWindow()->tqlayoutDefaultMargin() );
} else if ( propName == "tqlayoutSpacing" ) {
return TQVariant( MainWindow::self->formWindow()->layoutDefaultMargin() );
} else if ( propName == "layoutSpacing" ) {
if ( MainWindow::self->formWindow() )
return TQVariant( MainWindow::self->formWindow()->tqlayoutDefaultSpacing() );
return TQVariant( MainWindow::self->formWindow()->layoutDefaultSpacing() );
}
return *( *defaultProperties->tqfind( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).tqfind( propName );
@ -1794,7 +1794,7 @@ bool TQLayoutWidget::event( TQEvent *e )
/*
This function must be called on TQLayoutWidget creation and whenever
the TQLayoutWidget's tqparent tqlayout changes (e.g., from a TQHBoxLayout
to a TQVBoxLayout), because of the (illogical) way tqlayouting works.
to a TQVBoxLayout), because of the (illogical) way layouting works.
*/
void TQLayoutWidget::updateSizePolicy()
{
@ -1819,21 +1819,21 @@ void TQLayoutWidget::updateSizePolicy()
if ( tqlayout() ) {
/*
tqparentLayout is set to the tqparent tqlayout if there is one and if it is
top level, in which case tqlayouting is illogical.
parentLayout is set to the tqparent tqlayout if there is one and if it is
top level, in which case layouting is illogical.
*/
TQLayout *tqparentLayout = 0;
TQLayout *parentLayout = 0;
if ( tqparent() && tqparent()->isWidgetType() ) {
tqparentLayout = ((TQWidget *)tqparent())->tqlayout();
if ( tqparentLayout && tqparentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) )
tqparentLayout = 0;
parentLayout = ((TQWidget *)tqparent())->tqlayout();
if ( parentLayout && parentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) )
parentLayout = 0;
}
TQObjectListIt it( childrenListObject() );
TQObject *o;
if ( tqlayout()->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) {
if ( tqparentLayout && tqparentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
if ( parentLayout && parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
vt = TQSizePolicy::Minimum;
else
vt = TQSizePolicy::Fixed;
@ -1854,7 +1854,7 @@ void TQLayoutWidget::updateSizePolicy()
vt |= TQSizePolicy::Maximum;
}
} else if ( tqlayout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) {
if ( tqparentLayout && tqparentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
if ( parentLayout && parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
ht = TQSizePolicy::Minimum;
else
ht = TQSizePolicy::Fixed;
@ -1877,10 +1877,10 @@ void TQLayoutWidget::updateSizePolicy()
} else if ( tqlayout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
ht = TQSizePolicy::Fixed;
vt = TQSizePolicy::Fixed;
if ( tqparentLayout ) {
if ( tqparentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
if ( parentLayout ) {
if ( parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
ht = TQSizePolicy::Minimum;
else if ( tqparentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
else if ( parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
vt = TQSizePolicy::Minimum;
}
@ -1921,8 +1921,8 @@ void TQLayoutWidget::updateSizePolicy()
void CustomWidget::paintEvent( TQPaintEvent *e )
{
if ( tqparentWidget() && tqparentWidget()->inherits( "FormWindow" ) ) {
( (FormWindow*)tqparentWidget() )->paintGrid( this, e );
if ( parentWidget() && parentWidget()->inherits( "FormWindow" ) ) {
( (FormWindow*)parentWidget() )->paintGrid( this, e );
} else {
TQPainter p( this );
p.fillRect( rect(), tqcolorGroup().dark() );

50
kommander/editor/widgetfactory.h
Unescape View File

@ -75,10 +75,10 @@ public:
static TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type );
static void deleteLayout( TQWidget *widget );
static LayoutType tqlayoutType( TQWidget *w );
static LayoutType tqlayoutType( TQWidget *w, TQLayout *&tqlayout );
static LayoutType tqlayoutType( TQLayout *tqlayout );
static TQWidget *tqlayoutParent( TQLayout *tqlayout );
static LayoutType layoutType( TQWidget *w );
static LayoutType layoutType( TQWidget *w, TQLayout *&tqlayout );
static LayoutType layoutType( TQLayout *tqlayout );
static TQWidget *layoutParent( TQLayout *tqlayout );
static TQWidget* containerOfWidget( TQWidget *w );
static TQWidget* widgetOfContainer( TQWidget *w );
@ -251,7 +251,7 @@ class CustomWidget : public TQWidget
public:
CustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *cw )
: TQWidget( tqparent, name ), cusw( cw ) {
alwaysExpand = tqparentWidget() && tqparentWidget()->inherits( "FormWindow" );
alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" );
tqsetSizePolicy( cw->sizePolicy );
if ( !alwaysExpand )
setBackgroundMode( PaletteDark );
@ -381,15 +381,15 @@ public:
: TQToolButton( tqparent, name ) {}
bool isInButtonGroup() const {
return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
}
int buttonGroupId() const {
return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
}
void setButtonGroupId( int id ) {
if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
( (TQButtonGroup*)tqparentWidget() )->remove( this );
( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
( (TQButtonGroup*)parentWidget() )->remove( this );
( (TQButtonGroup*)parentWidget() )->insert( this, id );
}
}
};
@ -405,15 +405,15 @@ public:
: TQRadioButton( tqparent, name ) {}
bool isInButtonGroup() const {
return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
}
int buttonGroupId() const {
return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
}
void setButtonGroupId( int id ) {
if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
( (TQButtonGroup*)tqparentWidget() )->remove( this );
( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
( (TQButtonGroup*)parentWidget() )->remove( this );
( (TQButtonGroup*)parentWidget() )->insert( this, id );
}
}
@ -430,15 +430,15 @@ public:
: TQPushButton( tqparent, name ) {}
bool isInButtonGroup() const {
return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
}
int buttonGroupId() const {
return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
}
void setButtonGroupId( int id ) {
if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
( (TQButtonGroup*)tqparentWidget() )->remove( this );
( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
( (TQButtonGroup*)parentWidget() )->remove( this );
( (TQButtonGroup*)parentWidget() )->insert( this, id );
}
}
@ -455,15 +455,15 @@ public:
: TQCheckBox( tqparent, name ) {}
bool isInButtonGroup() const {
return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
}
int buttonGroupId() const {
return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
}
void setButtonGroupId( int id ) {
if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
( (TQButtonGroup*)tqparentWidget() )->remove( this );
( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
( (TQButtonGroup*)parentWidget() )->remove( this );
( (TQButtonGroup*)parentWidget() )->insert( this, id );
}
}

2
kommander/editor/wizardeditor.ui
Unescape View File

@ -316,5 +316,5 @@
<slot access="protected">removeClicked()</slot>
<slot access="protected">upClicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/current/a1.kmdr
Unescape View File

@ -254,5 +254,5 @@ StatusBar8.setText("Returned: "+b)</string>
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

8
kommander/examples/current/b1.kmdr
Unescape View File

@ -26,7 +26,7 @@ else
StatusBar9.insertItem("ARG1="+_ARG1, 1)
StatusBar9.insertItem("ARG2="+_ARG2, 2)
endif
//message_info(tqparentPid)</string>
//message_info(parentPid)</string>
<string></string>
</stringlist>
</property>
@ -120,8 +120,8 @@ endif
</property>
<property name="associations" stdset="0">
<stringlist>
<string>//message_info("tqparentPid = "+tqparentPid+"\npid = "+pid)
dcop("kmdr-executor-"+tqparentPid, "KommanderIf", "setText(QString,QString)", "StatusBar8", "Hello")
<string>//message_info("parentPid = "+parentPid+"\npid = "+pid)
dcop("kmdr-executor-"+parentPid, "KommanderIf", "setText(QString,QString)", "StatusBar8", "Hello")
</string>
</stringlist>
</property>
@ -131,5 +131,5 @@ dcop("kmdr-executor-"+tqparentPid, "KommanderIf", "setText(QString,QString)", "S
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

4
kommander/examples/current/editor-poc.kmdr
Unescape View File

@ -428,7 +428,7 @@ debug("Clicked at: "+Self.Item(0)+" "+Self.Item(1))
&lt;slot&gt;execute()&lt;/slot&gt;
&lt;/connection&gt;
&lt;/connections&gt;
&lt;tqlayoutdefaults spacing="6" margin="11"/&gt;
&lt;layoutdefaults spacing="6" margin="11"/&gt;
&lt;/UI&gt;
</string>
</property>
@ -1064,5 +1064,5 @@ TextEdit5.setColor(color)</string>
<slot>setChecked(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/current/keyvaluecombo.kmdr
Unescape View File

@ -384,5 +384,5 @@ endif</string>
<tabstop>ComboBox10</tabstop>
<tabstop>ListBox1</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/current/kpartmwframe.kmdr
Unescape View File

@ -614,5 +614,5 @@ endif</string>
<slot>execute()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/current/kpartpart.kmdr
Unescape View File

@ -167,5 +167,5 @@ endif
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/current/passvariables.kmdr
Unescape View File

@ -412,5 +412,5 @@ echo round(@Self.Item(1)/@Self.Item(2),5)
<slot>popup(int,int)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/current/tableselect.kmdr
Unescape View File

@ -498,5 +498,5 @@ end
<slot>popup(int,int)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/checkmail.kmdr
Unescape View File

@ -40,5 +40,5 @@
</property>
</widget>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/ex1.kmdr
Unescape View File

@ -101,5 +101,5 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/execprogram.kmdr
Unescape View File

@ -100,5 +100,5 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/firstform.kmdr.kmdr
Unescape View File

@ -84,5 +84,5 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/form1.kmdr
Unescape View File

@ -92,5 +92,5 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/form2.kmdr
Unescape View File

@ -114,5 +114,5 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/form3.kmdr
Unescape View File

@ -58,5 +58,5 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/form4.kmdr
Unescape View File

@ -84,5 +84,5 @@
<slot>setWidgetText(const QString&amp;)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/form5.kmdr
Unescape View File

@ -342,5 +342,5 @@ Ha ha. We got it all with Kommander!</string>
<slot>setText(const QString&amp;)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/newfile.kmdr
Unescape View File

@ -930,5 +930,5 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/populate.kmdr
Unescape View File

@ -107,5 +107,5 @@
<slot>populate()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/resize.kmdr
Unescape View File

@ -213,5 +213,5 @@ done
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/selectedwidgettext.kmdr
Unescape View File

@ -101,5 +101,5 @@
</widget>
</hbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/settings.kmdr
Unescape View File

@ -260,5 +260,5 @@ Items")
<slot>populate()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/simplelist.kmdr
Unescape View File

@ -210,5 +210,5 @@
</property>
</widget>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/tar.kmdr
Unescape View File

@ -475,5 +475,5 @@
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/tidy.kmdr
Unescape View File

@ -1155,5 +1155,5 @@ fi
<slot>setWidgetText(const QString&amp;)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/widgetgenerator.kmdr
Unescape View File

@ -434,5 +434,5 @@ echo "$cppContent" &gt; @directory/$classNameLower.cpp</string>
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/old/wizard.kmdr
Unescape View File

@ -297,5 +297,5 @@
<slot>execute()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/append.kmdr
Unescape View File

@ -111,5 +111,5 @@ dcop @dcopid KommanderIf changeWidgetText TextEdit1 "$TEXT"
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/arrays.kmdr
Unescape View File

@ -200,5 +200,5 @@
<slot>populate()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/calc.kmdr
Unescape View File

@ -267,5 +267,5 @@
<tabstop>ExecButton2</tabstop>
<tabstop>ListBox1</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/cmdline.kmdr
Unescape View File

@ -104,5 +104,5 @@ fi</string>
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/dcop.kmdr
Unescape View File

@ -135,5 +135,5 @@ dcop kmail KMailIface checkAccount @AccountListBox</string>
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/dialogs.kmdr
Unescape View File

@ -194,5 +194,5 @@ ListBox1.setText(a)
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/globals.kmdr
Unescape View File

@ -92,5 +92,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/initialize.kmdr
Unescape View File

@ -116,5 +116,5 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE"
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/loop.kmdr
Unescape View File

@ -110,5 +110,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/picview.kmdr
Unescape View File

@ -144,5 +144,5 @@
<slot>populate()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/progressbar.kmdr
Unescape View File

@ -188,5 +188,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/settings.kmdr
Unescape View File

@ -173,5 +173,5 @@
<slot>populate()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/slots.kmdr
Unescape View File

@ -196,5 +196,5 @@ fi
<slot>startProcess()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/statusbar.kmdr
Unescape View File

@ -95,5 +95,5 @@
<slot>populate()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/strings.kmdr
Unescape View File

@ -202,5 +202,5 @@ fi
<tabstop>ExecButton1</tabstop>
<tabstop>TextEdit1</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/table.kmdr
Unescape View File

@ -254,5 +254,5 @@
</hbox>
</widget>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/tree.kmdr
Unescape View File

@ -166,5 +166,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/examples/tutorial/widgets.kmdr
Unescape View File

@ -129,5 +129,5 @@
<slot>populate()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/executor/register.cpp
Unescape View File

@ -49,7 +49,7 @@ void Instance::registerSpecials()
SpecialInformation::insert("null", 0, 0);
SpecialInformation::insert("pid", 0, 0);
SpecialInformation::insert("dcopid", 0, 0);
SpecialInformation::insert("tqparentPid", 0, 0);
SpecialInformation::insert("parentPid", 0, 0);
SpecialInformation::insert("execBegin", 0, 1);
SpecialInformation::insert("env", 1, 1);
SpecialInformation::insert("exec", 1, 1);

6
kommander/factory/domtool.cpp
Unescape View File

@ -360,9 +360,9 @@ void DomTool::fixDocument( TQDomDocument& doc )
bool stdset = toBool( e.attribute( "stdset" ) );
if ( stdset || name == "toolTip" || name == "whatsThis" ||
name == "buddy" ||
e.tqparentNode().toElement().tagName() == "item" ||
e.tqparentNode().toElement().tagName() == "spacer" ||
e.tqparentNode().toElement().tagName() == "column"
e.parentNode().toElement().tagName() == "item" ||
e.parentNode().toElement().tagName() == "spacer" ||
e.parentNode().toElement().tagName() == "column"
)
e.removeAttribute( "stdset" );
else

28
kommander/factory/kommanderfactory.cpp
Unescape View File

@ -207,7 +207,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg
widgetFactory->variables << e.firstChild().toText().data();
} else if ( e.tagName() == "pixmapinproject" ) {
widgetFactory->usePixmapCollection = true;
} else if ( e.tagName() == "tqlayoutdefaults" ) {
} else if ( e.tagName() == "layoutdefaults" ) {
widgetFactory->defSpacing = e.attribute( "spacing", TQString::number( widgetFactory->defSpacing ) ).toInt();
widgetFactory->defMargin = e.attribute( "margin", TQString::number( widgetFactory->defMargin ) ).toInt();
}
@ -532,7 +532,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
w = ( (TQMainWindow*)w )->centralWidget();
if ( tqlayout ) {
switch( tqlayoutType( tqlayout ) ) {
switch( layoutType( tqlayout ) ) {
case HBox:
( (TQHBoxLayout*)tqlayout )->addWidget( w );
break;
@ -562,37 +562,37 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
createWidgetInternal( n, w, tqlayout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) );
dbControls = oldDbControls;
} else if ( n.tagName() == "hbox" ) {
TQLayout *tqparentLayout = tqlayout;
TQLayout *parentLayout = tqlayout;
if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
tqlayout = createLayout( 0, 0, KommanderFactory::HBox );
else
tqlayout = createLayout( w, tqlayout, KommanderFactory::HBox );
obj = TQT_TQOBJECT(tqlayout);
n = n.firstChild().toElement();
if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 );
if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 );
continue;
} else if ( n.tagName() == "grid" ) {
TQLayout *tqparentLayout = tqlayout;
TQLayout *parentLayout = tqlayout;
if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
tqlayout = createLayout( 0, 0, KommanderFactory::Grid );
else
tqlayout = createLayout( w, tqlayout, KommanderFactory::Grid );
obj = TQT_TQOBJECT(tqlayout);
n = n.firstChild().toElement();
if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 );
if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 );
continue;
} else if ( n.tagName() == "vbox" ) {
TQLayout *tqparentLayout = tqlayout;
TQLayout *parentLayout = tqlayout;
if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
tqlayout = createLayout( 0, 0, KommanderFactory::VBox );
else
tqlayout = createLayout( w, tqlayout, KommanderFactory::VBox );
obj = TQT_TQOBJECT(tqlayout);
n = n.firstChild().toElement();
if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 );
if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 );
continue;
} else if ( n.tagName() == "property" && obj ) {
setProperty( obj, n.attribute( "name" ), n.firstChild().toElement() );
@ -715,7 +715,7 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* tqlayout,
}
}
KommanderFactory::LayoutType KommanderFactory::tqlayoutType( TQLayout *tqlayout ) const
KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *tqlayout ) const
{
if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
return HBox;
@ -733,8 +733,8 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T
TQVariant defVariant;
if ( e.tagName() == "font" ) {
TQFont f( tqApp->font() );
if ( obj->isWidgetType() && ( (TQWidget*)obj )->tqparentWidget() )
f = ( (TQWidget*)obj )->tqparentWidget()->font();
if ( obj->isWidgetType() && ( (TQWidget*)obj )->parentWidget() )
f = ( (TQWidget*)obj )->parentWidget()->font();
defVariant = TQVariant( f );
}

2
kommander/factory/kommanderfactory.h
Unescape View File

@ -76,7 +76,7 @@ private:
void loadTabOrder( const TQDomElement &e );
TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout, const TQString &classNameArg );
TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type );
LayoutType tqlayoutType( TQLayout *l ) const;
LayoutType layoutType( TQLayout *l ) const;
void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e );
void createSpacer( const TQDomElement &e, TQLayout *tqlayout );
TQImage loadFromCollection( const TQString &name );

8
kommander/kmdrtools/dcoptool-oldparser.kmdr
Unescape View File

@ -594,7 +594,7 @@ fi
</item>
<item>
<property name="text">
<string>"kmdr-executor-"+tqparentPid</string>
<string>"kmdr-executor-"+parentPid</string>
</property>
</item>
<property name="name">
@ -1117,13 +1117,13 @@ fi
@setGlobal(PARM4,"")
@setGlobal(short,dcopid)
@setGlobal(DESC,"Returns DCOP identifier of current process. This is shorthand for &lt;i&gt;kmdr-executor-&amp;#064;pid&lt;/i&gt;.")
@case(Kommander::tqparentPid(QString,bool))
@case(Kommander::parentPid(QString,bool))
@setGlobal(enWidget,1)
@setGlobal(PARM1,"editable")
@setGlobal(PARM2,"")
@setGlobal(PARM3,"")
@setGlobal(PARM4,"")
@setGlobal(short,tqparentPid)
@setGlobal(short,parentPid)
@setGlobal(DESC,"Returns the pid of the tqparent Kommander window.")
@case(Kommander::debug(QString))
@setGlobal(enWidget,0)
@ -2121,5 +2121,5 @@ setColumnCaption(QString,int,QString)")
<tabstop>window</tabstop>
<tabstop>widgetName</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kommander/kmdrtools/examples.kmdr
View File

File diff suppressed because one or more lines are too long

4
kommander/part/kommander_part.cpp
Unescape View File

@ -33,13 +33,13 @@ typedef KParts::GenericFactory<KommanderPart> KommanderPartFactory;
K_EXPORT_COMPONENT_FACTORY( libkommander_part, KommanderPartFactory )
KommanderPart::KommanderPart( TQWidget *tqparentWidget, const char * /*widgetName*/,
KommanderPart::KommanderPart( TQWidget *parentWidget, const char * /*widgetName*/,
TQObject *tqparent, const char *name, const TQStringList & /*args*/ )
: KParts::ReadOnlyPart(tqparent, name)
{
setInstance( KommanderPartFactory::instance() );
m_instance = 0L;
m_widget = new TQWidget(tqparentWidget);
m_widget = new TQWidget(parentWidget);
setWidget(m_widget);
m_layout = new TQGridLayout(m_widget);
}

2
kommander/part/kommander_part.h
Unescape View File

@ -26,7 +26,7 @@ class KommanderPart : public KParts::ReadOnlyPart
Q_OBJECT
TQ_OBJECT
public:
KommanderPart(TQWidget *tqparentWidget, const char *widgetName,
KommanderPart(TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name, const TQStringList &args);
virtual ~KommanderPart();

2
kommander/plugin/specialinformation.cpp
Unescape View File

@ -400,7 +400,7 @@ void SpecialInformation::registerSpecials()
insert(Kommander::dcopid, "dcopid",
i18n("Returns DCOP identifier of current process. This is shorthand for <i>kmdr-executor-@pid</i>."),
0);
insert(Kommander::tqparentPid, "tqparentPid",
insert(Kommander::parentPid, "parentPid",
i18n("Returns the pid of the tqparent Kommander window."), 0);
insert(Kommander::debug, "debug(TQString text)",
i18n("Writes <i>text</i> on stderr."), 1);

2
kommander/plugin/specials.h
Unescape View File

@ -38,7 +38,7 @@ namespace DCOP
namespace Kommander
{
enum {widgetText, selectedWidgetText, null, pid, dcopid, tqparentPid, debug,
enum {widgetText, selectedWidgetText, null, pid, dcopid, parentPid, debug,
echo, env, exec, expr, global, i18n, dialog, readSetting, setGlobal, writeSetting, dcop,
switchBlock, execBegin, forBlock, forEachBlock, ifBlock, comment, createWidget, connect, disconnect, widgetExists, exit, Break, Continue, Return, execBackground, switchInternal}; //, tqfocusWidget};
}

6
kommander/widget/functionlib.cpp
Unescape View File

@ -407,8 +407,8 @@ static ParseNode f_createWidget(Parser* p, const ParameterList& params)
{
TQString widgetName = params[0].toString();
TQString widgetType = params[1].toString();
TQString tqparentName = params[2].toString();
KommanderWidget *widget = p->currentWidget()->widgetByName(tqparentName);
TQString parentName = params[2].toString();
KommanderWidget *widget = p->currentWidget()->widgetByName(parentName);
if (!widget)
return ParseNode::error("unknown widget");
TQWidget *tqparent = dynamic_cast<TQWidget*>(widget->object());
@ -944,7 +944,7 @@ void ParserData::registerStandardFunctions()
registerFunction("dcop", Function(&f_dcop, ValueString, ValueString, ValueString, 3, 100));
registerFunction("dcopid", Function(&f_dcopid, ValueString, ValueNone, 0, 0));
registerFunction("pid", Function(&f_pid, ValueString, ValueNone, 0, 0));
registerFunction("tqparentPid", Function(&f_parentPid, ValueString, ValueNone, 0, 0));
registerFunction("parentPid", Function(&f_parentPid, ValueString, ValueNone, 0, 0));
registerFunction("dialog", Function(&f_dialog, ValueString, ValueString, ValueString, 1, 2));
registerFunction("exec", Function(&f_exec, ValueString, ValueString, ValueString, 1, 2));
registerFunction("execBackground", Function(&f_execBackground, ValueString, ValueString, ValueString, 1, 2));

2
kommander/widget/kommanderfunctions.cpp
Unescape View File

@ -52,7 +52,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL
return execCommand(args[0]);
case Kommander::dcop:
return DCOPQuery(args);
case Kommander::tqparentPid:
case Kommander::parentPid:
return global("_PARENTPID").isEmpty() ? TQString().setNum(getppid()) : global("_PARENTPID");
case Kommander::env:
return TQString(getenv(args[0].latin1()));

22
kommander/widget/kommanderwidget.cpp
Unescape View File

@ -271,7 +271,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query)
}
if (!ok)
{
printError(i18n("Unmatched tqparenthesis in DCOP call \'%1\'.").tqarg(a_query[2]));
printError(i18n("Unmatched parenthesis in DCOP call \'%1\'.").tqarg(a_query[2]));
return TQString();
}
const TQStringList argTypes = parseArgs(pTypes, ok);
@ -413,12 +413,12 @@ void KommanderWidget::printError(const TQString& a_error) const
case KDialogBase::Yes:
break;
case KDialogBase::Cancel:
if (tqparentDialog()->inherits(TQDIALOG_OBJECT_NAME_STRING))
if (parentDialog()->inherits(TQDIALOG_OBJECT_NAME_STRING))
{
tqparentDialog()->close();
parentDialog()->close();
exit(-1);
}
else if (tqparentDialog()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))
else if (parentDialog()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))
kapp->quit();
}
}
@ -557,16 +557,16 @@ KommanderWidget* KommanderWidget::widgetByName(const TQString& a_name) const
KommanderWidget* KommanderWidget::parseWidget(const TQString& widgetName) const
{
if (TQString(tqparentDialog()->name()) == widgetName)
return dynamic_cast <KommanderWidget*>(tqparentDialog());
if (TQString(parentDialog()->name()) == widgetName)
return dynamic_cast <KommanderWidget*>(parentDialog());
TQCString s = widgetName.lower() == "self" ? m_thisObject->name() : widgetName.latin1();
TQObject* childObj = tqparentDialog()->child(s);
TQObject* childObj = parentDialog()->child(s);
/* if (!childObj)
{
Parser parser(internalParserData());
TQString variableValue = parser.variable(widgetName).toString();
s = variableValue.lower() == "self" ? m_thisObject->name() : variableValue.latin1();
childObj = tqparentDialog()->child(s);
childObj = parentDialog()->child(s);
}*/
return dynamic_cast <KommanderWidget*>(childObj);
}
@ -579,7 +579,7 @@ TQStringList KommanderWidget::parseFunction(const TQString& group, const TQStrin
TQString arg = parseBrackets(s, from, ok);
if (!ok)
{
printError(i18n("Unmatched tqparenthesis after \'%1\'.").tqarg(function));
printError(i18n("Unmatched parenthesis after \'%1\'.").tqarg(function));
return TQString();
}
const TQStringList args = parseArgs(arg, ok);
@ -649,7 +649,7 @@ TQString KommanderWidget::substituteVariable(TQString text, TQString variable, T
TQWidget* KommanderWidget::tqparentDialog() const
TQWidget* KommanderWidget::parentDialog() const
{
TQObject *superParent = m_thisObject;
while (superParent->tqparent())
@ -722,7 +722,7 @@ ParserData* KommanderWidget::internalParserData() const
TQString KommanderWidget::fileName()
{
KommanderWindow* window = dynamic_cast<KommanderWindow*>(tqparentDialog());
KommanderWindow* window = dynamic_cast<KommanderWindow*>(parentDialog());
if (window)
return TQString(window->fileName());
else

2
kommander/widget/kommanderwidget.h
Unescape View File

@ -141,7 +141,7 @@ protected:
// Parse given identifier as widget name
KommanderWidget* parseWidget(const TQString& name) const;
// Return tqparent dialog of this widget
TQWidget* tqparentDialog() const;
TQWidget* parentDialog() const;
TQString substituteVariable(TQString text, TQString variable, TQString value) const;
ParserData* internalParserData() const;

4
kommander/widgets/richtexteditor.cpp
Unescape View File

@ -106,7 +106,7 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name)
connect(m_alignGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(textAlign(int)));
connect(m_textedit, TQT_SIGNAL(currentFontChanged(const TQFont &)), this, TQT_SLOT(fontChanged(const TQFont &)));
connect(m_textedit, TQT_SIGNAL(currentAlignmentChanged(int)), this, TQT_SLOT(tqalignmentChanged(int)));
connect(m_textedit, TQT_SIGNAL(currentAlignmentChanged(int)), this, TQT_SLOT(alignmentChanged(int)));
connect(m_textedit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setTextChanged()));
@ -196,7 +196,7 @@ void RichTextEditor::fontChanged(const TQFont &a_font)
m_buttonTextUnder->setOn(a_font.underline());
}
void RichTextEditor::tqalignmentChanged(int a_tqalignment)
void RichTextEditor::alignmentChanged(int a_tqalignment)
{
if((a_tqalignment == AlignAuto) || (a_tqalignment & AlignLeft))
m_buttonTextLeft->setOn(true);

2
kommander/widgets/richtexteditor.h
Unescape View File

@ -63,7 +63,7 @@ public slots:
void textUnder(bool);
void textItalic(bool);
void fontChanged(const TQFont &);
void tqalignmentChanged(int);
void alignmentChanged(int);
virtual void populate();
signals:
void widgetOpened();

2
kommander/widgets/table.cpp
Unescape View File

@ -167,7 +167,7 @@ void Table::setCellText(int row, int col, const TQString& text)
{
KommanderWidget *w = widgetByName(widget->name());
if (w)
widget->reparent(tqparentDialog(), TQPoint(0,0));
widget->reparent(parentDialog(), TQPoint(0,0));
}
setText(row, col, text);
endEdit(row, col, false, false);

4
kxsldbg/kxsldbgpart/kxsldbg_part.cpp
Unescape View File

@ -67,7 +67,7 @@
typedef KParts::GenericFactory<KXsldbgPart> KXsldbgPartFactory;
K_EXPORT_COMPONENT_FACTORY( libkxsldbgpart, KXsldbgPartFactory )
KXsldbgPart::KXsldbgPart( TQWidget *tqparentWidget, const char * /*widgetName*/,
KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/,
TQObject *tqparent, const char *name,
const TQStringList & /*args*/ )
: DCOPObject("KXsldbgPart"), KParts::ReadOnlyPart(tqparent, name)
@ -81,7 +81,7 @@ KXsldbgPart::KXsldbgPart( TQWidget *tqparentWidget, const char * /*widgetName*/,
// we need an instance
setInstance( KXsldbgPartFactory::instance() );
TQVBox *frame = new TQVBox(tqparentWidget);
TQVBox *frame = new TQVBox(parentWidget);
TQHBox *h = new TQHBox(frame);
newXPath = new TQLineEdit(h);
xPathBtn = new TQPushButton(i18n("Goto XPath"), h);

2
kxsldbg/kxsldbgpart/kxsldbg_part.h
Unescape View File

@ -54,7 +54,7 @@ public:
/**
* Default constructor
*/
KXsldbgPart(TQWidget *tqparentWidget, const char *widgetName,
KXsldbgPart(TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name, const TQStringList &args);
/**

2
kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h
Unescape View File

@ -115,7 +115,7 @@ protected:
/** Add source to view, First parameter is TQString()
to indicate start of source list notfication */
void sourceItem(TQString /* fileName */, TQString /* tqparentFileName */, int /*lineNumber */);
void sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */);
/** Add parameter to view, First parameter is TQString()
to indicate start of parameter list notfication */

2
kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h
Unescape View File

@ -193,7 +193,7 @@ class XsldbgEventData {
// /** Add source to view, First parameter is TQString()
// to indicate start of source list notfication */
// void sourceItem(TQString /* fileName */, TQString /* tqparentFileName */, int /*lineNumber */);
// void sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */);
// /** Add parameter to view, First parameter is TQString()
// to indicate start of parameter list notfication */

2
kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui
Unescape View File

@ -578,5 +578,5 @@
<slot>slotAddAllTemplateBreakpoints()</slot>
<slot>slotDeleteAllBreakpoints()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kxsldbg/kxsldbgpart/xsldbgcallstack.ui
Unescape View File

@ -153,5 +153,5 @@
<slot>refresh()</slot>
<slot>selectionChanged(TQListViewItem*)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kxsldbg/kxsldbgpart/xsldbgconfig.ui
Unescape View File

@ -813,5 +813,5 @@
<slot>slotSourcefile(QString)</slot>
<slot>slotoutputfile(QString)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kxsldbg/kxsldbgpart/xsldbgentities.ui
Unescape View File

@ -157,5 +157,5 @@
<Q_SLOTS>
<slot>refresh()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui
Unescape View File

@ -268,5 +268,5 @@
<slot>refresh()</slot>
<slot>slotEvaluate()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kxsldbg/kxsldbgpart/xsldbglocalvariables.ui
Unescape View File

@ -370,5 +370,5 @@
<slot>slotEvaluate()</slot>
<slot>slotSetExpression()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui
Unescape View File

@ -171,5 +171,5 @@
<slot>accept()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kxsldbg/kxsldbgpart/xsldbgsources.ui
Unescape View File

@ -150,5 +150,5 @@
<slot>refresh()</slot>
<slot>selectionChanged(TQListViewItem*)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

8
kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp
Unescape View File

@ -28,8 +28,8 @@ XsldbgSourcesImpl::XsldbgSourcesImpl(XsldbgDebugger *debugger,
: XsldbgSources(tqparent, name), XsldbgDialogBase()
{
this->debugger = debugger;
connect(debugger, TQT_SIGNAL(sourceItem(TQString /* fileName */, TQString /* tqparentFileName */, int /*lineNumber */)),
this, TQT_SLOT(slotProcSourceItem(TQString /* fileName */, TQString /* tqparentFileName */, int /*lineNumber */)));
connect(debugger, TQT_SIGNAL(sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */)),
this, TQT_SLOT(slotProcSourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */)));
connect( sourceListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
this, TQT_SLOT(selectionChanged(TQListViewItem*)));
@ -42,13 +42,13 @@ XsldbgSourcesImpl::~XsldbgSourcesImpl(){
debugger = 0L;
}
void XsldbgSourcesImpl::slotProcSourceItem(TQString fileName , TQString tqparentFileName , int lineNumber )
void XsldbgSourcesImpl::slotProcSourceItem(TQString fileName , TQString parentFileName , int lineNumber )
{
if (fileName.isNull()){
sourceListView->clear();
}else{
sourceListView->insertItem(new XsldbgGlobalListItem(sourceListView,
tqparentFileName, lineNumber, fileName));
parentFileName, lineNumber, fileName));
}
}

2
kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h
Unescape View File

@ -40,7 +40,7 @@ public slots:
/** Process request to add source to view, First parameter is TQString()
to indicate start of source list notfication */
void slotProcSourceItem(TQString fileName , TQString tqparentFileName , int lineNumber );
void slotProcSourceItem(TQString fileName , TQString parentFileName , int lineNumber );
/** refresh data from source */
void refresh();

2
kxsldbg/kxsldbgpart/xsldbgtemplates.ui
Unescape View File

@ -96,5 +96,5 @@
<Q_SLOTS>
<slot>selectionChanged(TQListViewItem*)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui
Unescape View File

@ -235,5 +235,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

210
lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
Unescape View File

@ -324,7 +324,7 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd )
delete drag;
drag = nd;
if (drag->tqparentWidget()!=this) {
if (drag->parentWidget()!=this) {
drag->reparent(this,TQPoint(0,0));
}
@ -354,7 +354,7 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd )
void KDockWidgetHeader::addButton(KDockButton_Private* btn) {
if (!btn) return;
if (btn->tqparentWidget()!=this) {
if (btn->parentWidget()!=this) {
btn->reparent(this,TQPoint(0,0));
}
btn->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
@ -385,7 +385,7 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) {
}
void KDockWidgetHeader::removeButton(KDockButton_Private* btn) {
if (btn->tqparentWidget()==this) {
if (btn->parentWidget()==this) {
if (d->btns.tqcontainsRef(btn)) d->btns.removeRef(btn);
delete btn;
}
@ -533,10 +533,10 @@ void KDockWidget::setPixmap(const TQPixmap& pixmap) {
delete pix;
pix=new TQPixmap(pixmap);
setIcon(*pix);
KDockTabGroup *dtg=tqparentDockTabGroup();
KDockTabGroup *dtg=parentDockTabGroup();
if (dtg)
dtg->changeTab(this,pixmap,dtg->tabLabel(this));
TQWidget *contWid=tqparentDockContainer();
TQWidget *contWid=parentDockContainer();
if (contWid) {
KDockContainer *x = dynamic_cast<KDockContainer*>(contWid);
if (x) {
@ -859,7 +859,7 @@ void KDockWidget::show()
void KDockWidget::setDockWindowType (NET::WindowType windowType)
{
d->windowType = windowType;
applyToWidget( tqparentWidget(), TQPoint(0,0) );
applyToWidget( parentWidget(), TQPoint(0,0) );
}
#endif
@ -868,7 +868,7 @@ void KDockWidget::setDockWindowTransient (TQWidget *tqparent, bool transientEnab
{
d->_parent = tqparent;
d->transient = transientEnabled;
applyToWidget( tqparentWidget(), TQPoint(0,0) );
applyToWidget( parentWidget(), TQPoint(0,0) );
}
TQWidget *KDockWidget::transientTo() {
@ -899,13 +899,13 @@ bool KDockWidget::event( TQEvent *event )
emit manager->change();
break;
case TQEvent::CaptionChange:
if ( tqparentWidget() ){
if ( parentWidget() ){
if ( tqparent()->inherits("KDockSplitter") ){
((KDockSplitter*)(tqparent()))->updateName();
}
if ( tqparentDockTabGroup() ){
setDockTabName( tqparentDockTabGroup() );
tqparentDockTabGroup()->setTabLabel( this, tabPageLabel() );
if ( parentDockTabGroup() ){
setDockTabName( parentDockTabGroup() );
parentDockTabGroup()->setTabLabel( this, tabPageLabel() );
}
}
break;
@ -983,8 +983,8 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
// kdDebug(282)<<"KDockWidget::manualDock(): success = false (2)"<<endl;
}
if ( tqparent() && !tqparent()->inherits("KDockSplitter") && !tqparentDockTabGroup() &&
!(dynamic_cast<KDockContainer*>(tqparent())) && !tqparentDockContainer()){
if ( tqparent() && !tqparent()->inherits("KDockSplitter") && !parentDockTabGroup() &&
!(dynamic_cast<KDockContainer*>(tqparent())) && !parentDockContainer()){
// kdDebug(282)<<"KDockWidget::manualDock(): success = false (3)"<<endl;
// kdDebug(282)<<tqparent()->name()<<endl;
succes = false;
@ -1021,28 +1021,28 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
}
// kdDebug(282)<<"Looking for KDockTabGroup"<<endl;
KDockTabGroup* tqparentTab = target->tqparentDockTabGroup();
if ( tqparentTab ){
KDockTabGroup* parentTab = target->parentDockTabGroup();
if ( parentTab ){
// add to existing TabGroup
applyToWidget( tqparentTab );
tqparentTab->insertTab( this, icon() ? *icon() : TQPixmap(),
applyToWidget( parentTab );
parentTab->insertTab( this, icon() ? *icon() : TQPixmap(),
tabPageLabel(), tabIndex );
TQWidget *wantTransient=tqparentTab->transientTo();
TQWidget *wantTransient=parentTab->transientTo();
target->setDockWindowTransient(wantTransient,wantTransient);
setDockTabName( tqparentTab );
setDockTabName( parentTab );
if( !toolTipStr.isEmpty())
tqparentTab->setTabToolTip( this, toolTipStr);
parentTab->setTabToolTip( this, toolTipStr);
currentDockPos = KDockWidget::DockCenter;
emit manager->change();
return (KDockWidget*)tqparentTab->tqparent();
return (KDockWidget*)parentTab->tqparent();
}
else
{
// kdDebug(282)<<"Looking for KDockContainer"<<endl;
TQWidget *contWid=target->tqparentDockContainer();
TQWidget *contWid=target->parentDockContainer();
if (!contWid) contWid=target->widget;
if (contWid)
{
@ -1060,21 +1060,21 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
cont->insertWidget( this, icon() ? *icon() : TQPixmap(),
tabPageLabel(), tabIndex );
setLatestKDockContainer(contWid);
// setDockTabName( tqparentTab );
// setDockTabName( parentTab );
if( !toolTipStr.isEmpty())
cont->setToolTip( this, toolTipStr);
currentDockPos = KDockWidget::DockCenter;
emit manager->change();
return (KDockWidget*)(cont->tqparentDockWidget());
return (KDockWidget*)(cont->parentDockWidget());
}
}
}
// create a new dockwidget that will contain the target and this
TQWidget* tqparentDock = target->tqparentWidget();
KDockWidget* newDock = new KDockWidget( manager, "tempName", TQPixmap(TQString("")), tqparentDock );
TQWidget* parentDock = target->parentWidget();
KDockWidget* newDock = new KDockWidget( manager, "tempName", TQPixmap(TQString("")), parentDock );
newDock->currentDockPos = target->currentDockPos;
if ( dockPos == KDockWidget::DockCenter ){
@ -1084,9 +1084,9 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
}
newDock->eDocking = (target->eDocking & eDocking) & (~(int)KDockWidget::DockCenter);
newDock->applyToWidget( tqparentDock );
newDock->applyToWidget( parentDock );
if ( !tqparentDock ){
if ( !parentDock ){
// dock to a toplevel dockwidget means newDock is toplevel now
newDock->move( target->frameGeometry().topLeft() );
newDock->resize( target->tqgeometry().size() );
@ -1178,9 +1178,9 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
panner->show();
}
if ( tqparentDock ){
if ( tqparentDock->inherits("KDockSplitter") ){
KDockSplitter* sp = (KDockSplitter*)tqparentDock;
if ( parentDock ){
if ( parentDock->inherits("KDockSplitter") ){
KDockSplitter* sp = (KDockSplitter*)parentDock;
sp->deactivate();
if ( sp->getFirst() == target )
sp->activate( newDock, 0L );
@ -1197,18 +1197,18 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
return newDock;
}
KDockTabGroup* KDockWidget::tqparentDockTabGroup() const
KDockTabGroup* KDockWidget::parentDockTabGroup() const
{
if ( !tqparent() ) return 0L;
TQWidget* candidate = tqparentWidget()->tqparentWidget();
TQWidget* candidate = parentWidget()->parentWidget();
if ( candidate && candidate->inherits("KDockTabGroup") ) return (KDockTabGroup*)candidate;
return 0L;
}
TQWidget *KDockWidget::tqparentDockContainer() const
TQWidget *KDockWidget::parentDockContainer() const
{
if (!tqparent()) return 0L;
TQWidget* candidate = tqparentWidget()->tqparentWidget();
TQWidget* candidate = parentWidget()->parentWidget();
if (candidate && dynamic_cast<KDockContainer*>(candidate)) return candidate;
return 0L;
}
@ -1276,8 +1276,8 @@ void KDockWidget::undock()
manager->d->dragRect = TQRect ();
manager->drawDragRectangle ();
TQWidget* tqparentW = tqparentWidget();
if ( !tqparentW ){
TQWidget* parentW = parentWidget();
if ( !parentW ){
hide();
if (!d->blockHasUndockedSignal)
emit hasUndocked();
@ -1290,70 +1290,70 @@ void KDockWidget::undock()
manager->blockSignals(true);
manager->undockProcess = true;
bool isV = tqparentW->isVisibleToTLW();
bool isV = parentW->isVisibleToTLW();
//UNDOCK HAS TO BE IMPLEMENTED CORRECTLY :)
KDockTabGroup* tqparentTab = tqparentDockTabGroup();
if ( tqparentTab ){
d->index = tqparentTab->indexOf( this); // memorize the page position in the tab widget
tqparentTab->removePage( this );
KDockTabGroup* parentTab = parentDockTabGroup();
if ( parentTab ){
d->index = parentTab->indexOf( this); // memorize the page position in the tab widget
parentTab->removePage( this );
/*
TQWidget *wantTransient=tqparentTab->transientTo();
TQWidget *wantTransient=parentTab->transientTo();
target->setDockWindowTransient(wantTransient,wantTransient);
*/
setFormerBrotherDockWidget((KDockWidget*)tqparentTab->page(0));
setFormerBrotherDockWidget((KDockWidget*)parentTab->page(0));
applyToWidget( 0L );
if ( tqparentTab->count() == 1 ){
if ( parentTab->count() == 1 ){
// last subdock widget in the tab control
KDockWidget* lastTab = (KDockWidget*)tqparentTab->page(0);
tqparentTab->removePage( lastTab );
/* TQWidget *wantTransient=tqparentTab->transientTo();
KDockWidget* lastTab = (KDockWidget*)parentTab->page(0);
parentTab->removePage( lastTab );
/* TQWidget *wantTransient=parentTab->transientTo();
target->setDockWindowTransient(wantTransient,wantTransient);*/
lastTab->applyToWidget( 0L );
lastTab->move( tqparentTab->mapToGlobal(tqparentTab->frameGeometry().topLeft()) );
lastTab->move( parentTab->mapToGlobal(parentTab->frameGeometry().topLeft()) );
// KDockTabGroup always have a tqparent that is a KDockWidget
KDockWidget* tqparentOfTab = (KDockWidget*)tqparentTab->tqparent();
delete tqparentTab; // KDockTabGroup
KDockWidget* parentOfTab = (KDockWidget*)parentTab->tqparent();
delete parentTab; // KDockTabGroup
TQWidget* tqparentOfDockWidget = tqparentOfTab->tqparentWidget();
if ( !tqparentOfDockWidget ){
TQWidget* parentOfDockWidget = parentOfTab->parentWidget();
if ( !parentOfDockWidget ){
if ( isV ) lastTab->show();
} else {
if ( tqparentOfDockWidget->inherits("KDockSplitter") ){
KDockSplitter* split = (KDockSplitter*)tqparentOfDockWidget;
if ( parentOfDockWidget->inherits("KDockSplitter") ){
KDockSplitter* split = (KDockSplitter*)parentOfDockWidget;
lastTab->applyToWidget( split );
split->deactivate();
if ( split->getFirst() == tqparentOfTab ){
if ( split->getFirst() == parentOfTab ){
split->activate( lastTab );
if ( ((KDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical )
emit ((KDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, KDockWidget::DockLeft );
emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockLeft );
else
emit ((KDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, KDockWidget::DockTop );
emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockTop );
} else {
split->activate( 0L, lastTab );
if ( ((KDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical )
emit ((KDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, KDockWidget::DockRight );
emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockRight );
else
emit ((KDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, KDockWidget::DockBottom );
emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockBottom );
}
split->show();
} else {
lastTab->applyToWidget( tqparentOfDockWidget );
lastTab->applyToWidget( parentOfDockWidget );
}
lastTab->show();
}
manager->blockSignals(false);
emit manager->replaceDock( tqparentOfTab, lastTab );
lastTab->currentDockPos = tqparentOfTab->currentDockPos;
emit tqparentOfTab->iMBeingClosed();
emit manager->replaceDock( parentOfTab, lastTab );
lastTab->currentDockPos = parentOfTab->currentDockPos;
emit parentOfTab->iMBeingClosed();
manager->blockSignals(true);
delete tqparentOfTab;
delete parentOfTab;
} else {
setDockTabName( tqparentTab );
setDockTabName( parentTab );
}
} else {
/*********************************************************************************************/
@ -1366,41 +1366,41 @@ void KDockWidget::undock()
KDockContainer* dc = dynamic_cast<KDockContainer*>(d->container.operator->());
if (dc) {
dc->undockWidget(this);
setFormerBrotherDockWidget(dc->tqparentDockWidget());
setFormerBrotherDockWidget(dc->parentDockWidget());
}
applyToWidget( 0L );
}
if (!undockedFromContainer) {
/*********************************************************************************************/
if ( tqparentW->inherits("KDockSplitter") ){
KDockSplitter* tqparentSplitterOfDockWidget = (KDockSplitter*)tqparentW;
d->splitPosInPercent = tqparentSplitterOfDockWidget->separatorPos();
if ( parentW->inherits("KDockSplitter") ){
KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)parentW;
d->splitPosInPercent = parentSplitterOfDockWidget->separatorPos();
KDockWidget* secondWidget = (KDockWidget*)tqparentSplitterOfDockWidget->getAnother( this );
KDockWidget* group = (KDockWidget*)tqparentSplitterOfDockWidget->tqparentWidget();
KDockWidget* secondWidget = (KDockWidget*)parentSplitterOfDockWidget->getAnother( this );
KDockWidget* group = (KDockWidget*)parentSplitterOfDockWidget->parentWidget();
setFormerBrotherDockWidget(secondWidget);
applyToWidget( 0L );
group->hide();
if ( !group->tqparentWidget() ){
if ( !group->parentWidget() ){
secondWidget->applyToWidget( 0L, group->frameGeometry().topLeft() );
secondWidget->resize( group->width(), group->height() );
} else {
TQWidget* obj = group->tqparentWidget();
TQWidget* obj = group->parentWidget();
secondWidget->applyToWidget( obj );
if ( obj->inherits("KDockSplitter") ){
KDockSplitter* tqparentOfGroup = (KDockSplitter*)obj;
tqparentOfGroup->deactivate();
KDockSplitter* parentOfGroup = (KDockSplitter*)obj;
parentOfGroup->deactivate();
if ( tqparentOfGroup->getFirst() == group )
tqparentOfGroup->activate( secondWidget );
if ( parentOfGroup->getFirst() == group )
parentOfGroup->activate( secondWidget );
else
tqparentOfGroup->activate( 0L, secondWidget );
parentOfGroup->activate( 0L, secondWidget );
}
}
secondWidget->currentDockPos = group->currentDockPos;
secondWidget->formerDockPos = group->formerDockPos;
delete tqparentSplitterOfDockWidget;
delete parentSplitterOfDockWidget;
manager->blockSignals(false);
emit manager->replaceDock( group, secondWidget );
emit group->iMBeingClosed();
@ -1475,13 +1475,13 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab )
listOfCaption.remove( listOfCaption.length()-1, 1 );
listOfName.remove( listOfName.length()-1, 1 );
tab->tqparentWidget()->setName( listOfName.utf8() );
tab->tqparentWidget()->setCaption( listOfCaption );
tab->parentWidget()->setName( listOfName.utf8() );
tab->parentWidget()->setCaption( listOfCaption );
tab->tqparentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint
if ( tab->tqparentWidget()->tqparent() )
if ( tab->tqparentWidget()->tqparent()->inherits("KDockSplitter") )
((KDockSplitter*)(tab->tqparentWidget()->tqparent()))->updateName();
tab->parentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint
if ( tab->parentWidget()->tqparent() )
if ( tab->parentWidget()->tqparent()->inherits("KDockSplitter") )
((KDockSplitter*)(tab->parentWidget()->tqparent()))->updateName();
}
bool KDockWidget::mayBeHide() const
@ -1514,11 +1514,11 @@ void KDockWidget::changeHideShowState()
void KDockWidget::makeDockVisible()
{
if ( tqparentDockTabGroup() ){
tqparentDockTabGroup()->showPage( this );
if ( parentDockTabGroup() ){
parentDockTabGroup()->showPage( this );
}
if (tqparentDockContainer()) {
TQWidget *contWid=tqparentDockContainer();
if (parentDockContainer()) {
TQWidget *contWid=parentDockContainer();
KDockContainer *x = dynamic_cast<KDockContainer*>(contWid);
if (x) {
x->showWidget(this);
@ -1526,11 +1526,11 @@ void KDockWidget::makeDockVisible()
}
if ( isVisible() ) return;
TQWidget* p = tqparentWidget();
TQWidget* p = parentWidget();
while ( p ){
if ( !p->isVisible() )
p->show();
p = p->tqparentWidget();
p = p->parentWidget();
}
if( !tqparent() ) // is undocked
dockBack();
@ -1676,7 +1676,7 @@ void KDockManager::activate()
while ( (obj=(KDockWidget*)it.current()) ) {
++it;
if ( obj->widget ) obj->widget->show();
if ( !obj->tqparentDockTabGroup() ){
if ( !obj->parentDockTabGroup() ){
obj->show();
}
}
@ -1847,7 +1847,7 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos )
if (!childDockWidgetList) return 0L;
if ( childDockWidgetList->tqfind(w) != -1 ) return 0L;
if ( currentDragWidget->isGroup && ((KDockWidget*)w)->tqparentDockTabGroup() ) return 0L;
if ( currentDragWidget->isGroup && ((KDockWidget*)w)->parentDockTabGroup() ) return 0L;
KDockWidget* www = (KDockWidget*)w;
if ( www->sDocking == (int)KDockWidget::DockNone ) return 0L;
@ -1931,9 +1931,9 @@ void KDockManager::startDrag( KDockWidget* w )
|| ( w->currentDockPos == KDockWidget::DockTop) || ( w->currentDockPos == KDockWidget::DockBottom)) {
w->prevSideDockPosBeforeDrag = w->currentDockPos;
if ( w->tqparentWidget()->inherits("KDockSplitter") ){
KDockSplitter* tqparentSplitterOfDockWidget = (KDockSplitter*)(w->tqparentWidget());
w->d->splitPosInPercent = tqparentSplitterOfDockWidget->separatorPos();
if ( w->parentWidget()->inherits("KDockSplitter") ){
KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->parentWidget());
w->d->splitPosInPercent = parentSplitterOfDockWidget->separatorPos();
}
}
@ -1949,7 +1949,7 @@ void KDockManager::dragMove( KDockWidget* dw, TQPoint pos )
KDockWidget::DockPosition oldPos = curPos;
TQSize r = dw->widget->size();
if ( dw->tqparentDockTabGroup() ){
if ( dw->parentDockTabGroup() ){
curPos = KDockWidget::DockCenter;
if ( oldPos != curPos ) {
d->dragRect.setRect( p.x()+2, p.y()+2, r.width()-4, r.height()-4 );
@ -3118,10 +3118,10 @@ KDockContainer::~KDockContainer(){
void KDockContainer::activateOverlapMode(int nonOverlapSize) {
m_nonOverlapSize=nonOverlapSize;
m_overlapMode=true;
if (tqparentDockWidget()) {
if (tqparentDockWidget()->tqparent()) {
if (parentDockWidget()) {
if (parentDockWidget()->tqparent()) {
kdDebug(282)<<"KDockContainer::activateOverlapMode: recalculating sizes"<<endl;
KDockSplitter *sp= static_cast<KDockSplitter*>(tqparentDockWidget()->
KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
tqparent()->qt_cast("KDockSplitter"));
if (sp) sp->resizeEvent(0);
}
@ -3131,10 +3131,10 @@ void KDockContainer::activateOverlapMode(int nonOverlapSize) {
void KDockContainer::deactivateOverlapMode() {
if (!m_overlapMode) return;
m_overlapMode=false;
if (tqparentDockWidget()) {
if (tqparentDockWidget()->tqparent()) {
if (parentDockWidget()) {
if (parentDockWidget()->tqparent()) {
kdDebug(282)<<"KDockContainer::deactivateOverlapMode: recalculating sizes"<<endl;
KDockSplitter *sp= static_cast<KDockSplitter*>(tqparentDockWidget()->
KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
tqparent()->qt_cast("KDockSplitter"));
if (sp) sp->resizeEvent(0);
}
@ -3152,7 +3152,7 @@ bool KDockContainer::dockDragMove(KDockWidget*, TQMouseEvent *) { return false;}
bool KDockContainer::dockDragLeave(KDockWidget*, TQMouseEvent *) { return false;}
KDockWidget *KDockContainer::tqparentDockWidget(){return 0;}
KDockWidget *KDockContainer::parentDockWidget(){return 0;}
TQStringList KDockContainer::containedWidgets() const {
TQStringList tmp;

6
lib/compatibility/kmdi/qextmdi/kdockwidget.h
Unescape View File

@ -632,10 +632,10 @@ public:
/**
* @return the tqparent widget of this if it inherits class KDockTabGroup
*/
KDockTabGroup* tqparentDockTabGroup() const;
KDockTabGroup* parentDockTabGroup() const;
/// @since 3.1
TQWidget *tqparentDockContainer() const;
TQWidget *parentDockContainer() const;
#ifndef NO_KDE2
@ -946,7 +946,7 @@ public:
#ifndef NO_KDE2
/**
* Saves the current state of the dockmanager and of all controlled widgets.
* State means here to save the tqgeometry, visibility, tqparents, internal object names, orientation,
* State means here to save the tqgeometry, visibility, parents, internal object names, orientation,
* separator positions, dockwidget-group information, tab widget states (if it is a tab group) and
* last but not least some necessary things for recovering the dockmainwindow state.
*

2
lib/compatibility/kmdi/qextmdi/kdockwidget_p.h
Unescape View File

@ -45,7 +45,7 @@ class KDEUI_EXPORT KDockContainer
public:
KDockContainer();
virtual ~KDockContainer();
virtual KDockWidget *tqparentDockWidget();
virtual KDockWidget *parentDockWidget();
virtual void insertWidget (KDockWidget *, TQPixmap, const TQString &, int &);
virtual void showWidget(KDockWidget *);
virtual void removeWidget(KDockWidget*);

14
lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp
Unescape View File

@ -490,15 +490,15 @@ void KDockSplitter::updateName()
if ( !initialised ) return;
TQString new_name = TQString( child0->name() ) + "," + child1->name();
tqparentWidget()->setName( new_name.latin1() );
tqparentWidget()->setCaption( child0->caption() + "," + child1->caption() );
tqparentWidget()->tqrepaint( false );
parentWidget()->setName( new_name.latin1() );
parentWidget()->setCaption( child0->caption() + "," + child1->caption() );
parentWidget()->tqrepaint( false );
((KDockWidget*)tqparentWidget())->firstName = child0->name();
((KDockWidget*)tqparentWidget())->lastName = child1->name();
((KDockWidget*)tqparentWidget())->splitterOrientation = m_orientation;
((KDockWidget*)parentWidget())->firstName = child0->name();
((KDockWidget*)parentWidget())->lastName = child1->name();
((KDockWidget*)parentWidget())->splitterOrientation = m_orientation;
TQWidget* p = tqparentWidget()->tqparentWidget();
TQWidget* p = parentWidget()->parentWidget();
if ( p && p->inherits("KDockSplitter" ) )
((KDockSplitter*)p)->updateName();
}

4
lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
Unescape View File

@ -244,7 +244,7 @@ void KMdiChildArea::resizeEvent( TQResizeEvent* e )
height() + child->m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR + KMDI_CHILDFRM_DOUBLE_BORDER );
}
tqlayoutMinimizedChildren();
layoutMinimizedChildren();
TQWidget::resizeEvent( e );
}
@ -724,7 +724,7 @@ void KMdiChildArea::tileVertically()
}
void KMdiChildArea::tqlayoutMinimizedChildren()
void KMdiChildArea::layoutMinimizedChildren()
{
int posX = 0;
int posY = height();

4
lib/compatibility/kmdi/qextmdi/kmdichildarea.h
Unescape View File

@ -242,7 +242,7 @@ public slots:
/**
* Position and tqlayout the minimized child frames
*/
void tqlayoutMinimizedChildren();
void layoutMinimizedChildren();
protected:
@ -252,7 +252,7 @@ protected:
void tileAllInternal( int maxWnds );
/**
* Automatically resizes a maximized MDI view and tqlayouts the positions of minimized MDI views.
* Automatically resizes a maximized MDI view and layouts the positions of minimized MDI views.
*/
virtual void resizeEvent( TQResizeEvent * );

6
lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp
Unescape View File

@ -286,7 +286,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e )
if ( !( e->state() & Qt::RightButton ) && !( e->state() & Qt::MidButton ) )
{
// same as: if no button or left button pressed
TQPoint p = tqparentWidget()->mapFromGlobal( e->globalPos() );
TQPoint p = parentWidget()->mapFromGlobal( e->globalPos() );
resizeWindow( m_iResizeCorner, p.x(), p.y() );
}
else
@ -1308,7 +1308,7 @@ void KMdiChildFrm::switchToMinimizeLayout()
resize( 300, minimumHeight() );
// positioning
m_pManager->tqlayoutMinimizedChildren();
m_pManager->layoutMinimizedChildren();
}
void KMdiChildFrm::slot_resizeViaSystemMenu()
@ -1394,7 +1394,7 @@ void KMdiChildFrm::redecorateButtons()
TQRect KMdiChildFrm::mdiAreaContentsRect() const
{
TQFrame * p = ( TQFrame* ) tqparentWidget();
TQFrame * p = ( TQFrame* ) parentWidget();
if ( p )
{
return p->contentsRect();

6
lib/compatibility/kmdi/qextmdi/kmdichildfrm.h
Unescape View File

@ -194,14 +194,14 @@ public:
~KMdiChildFrm();
/**
* Retqparents the widget w to this KMdiChildFrm (if this is not already done)
* Reparents the widget w to this KMdiChildFrm (if this is not already done)
* Installs an event filter to catch focus events.
* Resizes this mdi child in a way that the child fits perfectly in.
*/
void setClient( KMdiChildView *w, bool bAutomaticResize = false );
/**
* Retqparents the client widget to 0 (desktop), moves with an offset from the original position
* Reparents the client widget to 0 (desktop), moves with an offset from the original position
* Removes the event filter.
*/
void unsetClient( TQPoint positionOffset = TQPoint( 0, 0 ) );
@ -308,7 +308,7 @@ protected:
/**
* Reimplemented from the base class.
* Resizes the captionbar, retqlayouts the position of the system buttons,
* Resizes the captionbar, relayouts the position of the system buttons,
* and calls resize for its embedded KMdiChildView with the proper size
*/
virtual void resizeEvent( TQResizeEvent * );

2
lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp
Unescape View File

@ -163,7 +163,7 @@ void KMdiChildFrmCaption::mouseMoveEvent( TQMouseEvent *e )
TQPoint mousePosInChildArea = relMousePosInChildArea - m_offset;
// set new child frame position
tqparentWidget() ->move( mousePosInChildArea );
parentWidget() ->move( mousePosInChildArea );
}
//=============== setActive ===============//

8
lib/compatibility/kmdi/qextmdi/kmdichildview.cpp
Unescape View File

@ -44,8 +44,8 @@
//============ KMdiChildView ============//
KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* tqparentWidget, const char* name, WFlags f )
: TQWidget( tqparentWidget, name, f )
KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* parentWidget, const char* name, WFlags f )
: TQWidget( parentWidget, name, f )
, m_focusedChildWidget( 0L )
, m_firstFocusableChildWidget( 0L )
, m_lastFocusableChildWidget( 0L )
@ -73,8 +73,8 @@ KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* tqparentWidget,
//============ KMdiChildView ============//
KMdiChildView::KMdiChildView( TQWidget* tqparentWidget, const char* name, WFlags f )
: TQWidget( tqparentWidget, name, f )
KMdiChildView::KMdiChildView( TQWidget* parentWidget, const char* name, WFlags f )
: TQWidget( parentWidget, name, f )
, m_focusedChildWidget( 0L )
, m_firstFocusableChildWidget( 0L )
, m_lastFocusableChildWidget( 0L )

6
lib/compatibility/kmdi/qextmdi/kmdichildview.h
Unescape View File

@ -183,13 +183,13 @@ public:
/**
* Constructor
*/
KMdiChildView( const TQString& caption, TQWidget* tqparentWidget = 0L, const char* name = 0L, WFlags f = 0 );
KMdiChildView( const TQString& caption, TQWidget* parentWidget = 0L, const char* name = 0L, WFlags f = 0 );
/**
* Constructor
* sets "Unnamed" as default caption
*/
KMdiChildView( TQWidget* tqparentWidget = 0L, const char* name = 0L, WFlags f = 0 );
KMdiChildView( TQWidget* parentWidget = 0L, const char* name = 0L, WFlags f = 0 );
/**
* Destructor
@ -604,7 +604,7 @@ private:
inline KMdiChildFrm *KMdiChildView::mdiParent() const
{
TQWidget * pw = tqparentWidget();
TQWidget * pw = parentWidget();
if ( pw != 0L )
if ( pw->inherits( "KMdiChildFrm" ) )
return ( KMdiChildFrm * ) pw;

40
lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
Unescape View File

@ -156,26 +156,26 @@ void KMdiDockContainer::init()
if ( !m_horizontal )
{
kdDebug( 760 ) << k_funcinfo << "Horizontal tabbar. Setting forced fixed width." << endl;
tqparentDockWidget()->setForcedFixedWidth( m_tb->width() );
parentDockWidget()->setForcedFixedWidth( m_tb->width() );
activateOverlapMode( m_tb->width() );
}
else
{
kdDebug( 760 ) << k_funcinfo << "Vertical tabbar. Setting forced fixed height." << endl;
tqparentDockWidget()->setForcedFixedHeight( m_tb->height() );
parentDockWidget()->setForcedFixedHeight( m_tb->height() );
activateOverlapMode( m_tb->height() );
}
// try to restore splitter size
if ( tqparentDockWidget() && tqparentDockWidget()->tqparent() )
if ( parentDockWidget() && parentDockWidget()->tqparent() )
{
KDockSplitter * sp = static_cast<KDockSplitter*>( tqparentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) );
KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) );
if ( sp )
sp->setSeparatorPosX( m_separatorPos );
}
}
KDockWidget* KMdiDockContainer::tqparentDockWidget()
KDockWidget* KMdiDockContainer::parentDockWidget()
{
return ( ( KDockWidget* ) tqparent() );
}
@ -201,8 +201,8 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
m_map.insert( w, tab );
m_revMap.insert( tab, w );
if ( ( ( KDockWidget* ) tqparentWidget() ) ->mayBeShow() )
( ( KDockWidget* ) tqparentWidget() ) ->dockBack();
if ( ( ( KDockWidget* ) parentWidget() ) ->mayBeShow() )
( ( KDockWidget* ) parentWidget() ) ->dockBack();
if ( w->getHeader()->qt_cast( "KDockWidgetHeader" ) )
{
@ -359,7 +359,7 @@ void KMdiDockContainer::hideIfNeeded()
if ( itemNames.count() == 0 )
{
kdDebug( 760 ) << k_funcinfo << "Hiding the dock container" << endl;
( ( KDockWidget* ) tqparentWidget() )->undock();
( ( KDockWidget* ) parentWidget() )->undock();
}
}
@ -421,14 +421,14 @@ void KMdiDockContainer::tabClicked( int t )
{
kdDebug( 760 ) << k_funcinfo << "Showing widgetstack for tab just clicked" << endl;
m_ws->show();
tqparentDockWidget()->restoreFromForcedFixedSize();
parentDockWidget()->restoreFromForcedFixedSize();
}
if ( !m_ws->widget( t ) )
{
kdDebug( 760 ) << k_funcinfo << "Widget tab was clicked for is not in our stack" << endl;
kdDebug( 760 ) << k_funcinfo << "Docking it back in" << endl;
m_revMap[t]->manualDock( tqparentDockWidget(), KDockWidget::DockCenter, 20 );
m_revMap[t]->manualDock( parentDockWidget(), KDockWidget::DockCenter, 20 );
if ( call_makeVisible )
m_revMap[t]->makeDockVisible();
m_tabSwitching = false;
@ -462,9 +462,9 @@ void KMdiDockContainer::tabClicked( int t )
{
kdDebug( 760 ) << k_funcinfo << "Tab " << t << " was just deactiviated" << endl;
// try save splitter position
if ( tqparentDockWidget() && tqparentDockWidget()->tqparent() )
if ( parentDockWidget() && parentDockWidget()->tqparent() )
{
KDockSplitter * sp = static_cast<KDockSplitter*>( tqparentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) );
KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) );
if ( sp )
m_separatorPos = sp->separatorPos();
}
@ -484,9 +484,9 @@ void KMdiDockContainer::tabClicked( int t )
kdDebug( 760 ) << k_funcinfo << "Fixed Width:" << m_tb->width() << endl;
if ( !m_horizontal )
tqparentDockWidget()->setForcedFixedWidth( m_tb->width() ); // strange why it worked before at all
parentDockWidget()->setForcedFixedWidth( m_tb->width() ); // strange why it worked before at all
else
tqparentDockWidget()->setForcedFixedHeight( m_tb->height() ); // strange why it worked before at all
parentDockWidget()->setForcedFixedHeight( m_tb->height() ); // strange why it worked before at all
}
m_tabSwitching = false;
}
@ -589,9 +589,9 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
TQPtrListIterator<KMultiTabBarTab> it1( *tl );
m_ws->hide();
if ( !m_horizontal )
tqparentDockWidget()->setForcedFixedWidth( m_tb->width() );
parentDockWidget()->setForcedFixedWidth( m_tb->width() );
else
tqparentDockWidget()->setForcedFixedHeight( m_tb->height() );
parentDockWidget()->setForcedFixedHeight( m_tb->height() );
for ( ;it1.current() != 0;++it1 )
m_tb->setTab( it1.current() ->id(), false );
@ -633,9 +633,9 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
cfg->writeEntry( "overlapMode", "false" );
// try to save the splitter position
if ( tqparentDockWidget() && tqparentDockWidget() ->tqparent() )
if ( parentDockWidget() && parentDockWidget() ->tqparent() )
{
KDockSplitter * sp = static_cast<KDockSplitter*>( tqparentDockWidget() ->
KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget() ->
tqparent() ->qt_cast( "KDockSplitter" ) );
if ( sp )
cfg->writeEntry( "separatorPos", m_separatorPos );
@ -714,9 +714,9 @@ void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix )
TQPtrListIterator<KMultiTabBarTab> it1( *tl );
m_ws->hide();
if ( !m_horizontal )
tqparentDockWidget() ->setForcedFixedWidth( m_tb->width() );
parentDockWidget() ->setForcedFixedWidth( m_tb->width() );
else
tqparentDockWidget() ->setForcedFixedHeight( m_tb->height() );
parentDockWidget() ->setForcedFixedHeight( m_tb->height() );
for ( ;it1.current() != 0;++it1 )
{
m_tb->setTab( it1.current() ->id(), false );

2
lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h
Unescape View File

@ -44,7 +44,7 @@ public:
virtual ~KMdiDockContainer();
/** Get the KDockWidget that is our tqparent */
KDockWidget *tqparentDockWidget();
KDockWidget *parentDockWidget();
/**
* Add a widget to this container

4
lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
Unescape View File

@ -82,8 +82,8 @@ void ToggleToolViewAction::anDWChanged()
setChecked( false );
else if ( ( !isChecked() ) && m_dw->mayBeHide() )
setChecked( true );
else if ( isChecked() && ( m_dw->tqparentDockTabGroup() &&
( ( static_cast<KDockWidget*>( m_dw->tqparentDockTabGroup() ->
else if ( isChecked() && ( m_dw->parentDockTabGroup() &&
( ( static_cast<KDockWidget*>( m_dw->parentDockTabGroup() ->
tqparent() ->qt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) )
setChecked( false );
}

90
lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp
Unescape View File

@ -135,8 +135,8 @@ public:
};
//============ constructor ============//
KMdiMainFrm::KMdiMainFrm( TQWidget* tqparentWidget, const char* name, KMdi::MdiMode mdiMode, WFlags flags )
: KParts::DockMainWindow( tqparentWidget, name, flags )
KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMode mdiMode, WFlags flags )
: KParts::DockMainWindow( parentWidget, name, flags )
, m_mdiMode( KMdi::UndefinedMode )
, m_pMdi( 0L )
, m_pTaskBar( 0L )
@ -298,7 +298,7 @@ void KMdiMainFrm::setStandardMDIMenuEnabled( bool showModeMenu )
//============ ~KMdiMainFrm ============//
KMdiMainFrm::~KMdiMainFrm()
{
//save the tqchildren first to a list, as removing tqinvalidates our iterator
//save the tqchildren first to a list, as removing invalidates our iterator
TQValueList<KMdiChildView*> tqchildren;
for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() )
tqchildren.append( w );
@ -395,7 +395,7 @@ void KMdiMainFrm::slot_toggleTaskBar()
void KMdiMainFrm::resizeEvent( TQResizeEvent *e )
{
if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() )
if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() )
{
if ( e->oldSize().height() != e->size().height() )
return ;
@ -410,7 +410,7 @@ void KMdiMainFrm::resizeEvent( TQResizeEvent *e )
void KMdiMainFrm::setMinimumSize( int minw, int minh )
{
if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() )
if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() )
return ;
DockMainWindow::setMinimumSize( minw, minh );
}
@ -631,7 +631,7 @@ void KMdiMainFrm::attachWindow( KMdiChildView *pWnd, bool bShow, bool bAutomatic
lpC->setClient( pWnd, bAutomaticResize );
lpC->setFocus();
pWnd->youAreAttached( lpC );
if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() )
if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() )
{
setMinimumHeight( m_oldMainFrmMinHeight );
setMaximumHeight( m_oldMainFrmMaxHeight );
@ -776,12 +776,12 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd )
m_pDockbaseOfTabPage = m_pDockbaseAreaOfDocumentViews;
m_pClose->hide();
}
KDockWidget* pDockW = ( KDockWidget* ) pWnd->tqparentWidget();
KDockWidget* pDockW = ( KDockWidget* ) pWnd->parentWidget();
pWnd->reparent( 0L, TQPoint( 0, 0 ) );
pDockW->setWidget( 0L );
if ( pDockW == m_pDockbaseOfTabPage )
{
TQTabWidget * pTab = ( TQTabWidget* ) pDockW->tqparentWidget() ->tqparentWidget();
TQTabWidget * pTab = ( TQTabWidget* ) pDockW->parentWidget() ->parentWidget();
int cnt = pTab->count();
m_pDockbaseOfTabPage = ( KDockWidget* ) pTab->page( cnt - 2 );
if ( pDockW == m_pDockbaseOfTabPage )
@ -829,7 +829,7 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd )
}
//============== closeWindow ==============//
void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar )
void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool layoutTaskBar )
{
if ( !pWnd )
return ;
@ -840,7 +840,7 @@ void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar )
if ( m_pTaskBar )
{
m_pTaskBar->removeWinButton( pWnd, tqlayoutTaskBar );
m_pTaskBar->removeWinButton( pWnd, layoutTaskBar );
}
if ( ( m_mdiMode == KMdi::TabPageMode ) || ( m_mdiMode == KMdi::IDEAlMode ) )
@ -878,12 +878,12 @@ void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar )
m_pClose->hide();
}
#if 0
KDockWidget* pDockW = ( KDockWidget* ) pWnd->tqparentWidget();
KDockWidget* pDockW = ( KDockWidget* ) pWnd->parentWidget();
pWnd->reparent( 0L, TQPoint( 0, 0 ) );
pDockW->setWidget( 0L );
if ( pDockW == m_pDockbaseOfTabPage )
{
TQTabWidget * pTab = ( TQTabWidget* ) pDockW->tqparentWidget() ->tqparentWidget();
TQTabWidget * pTab = ( TQTabWidget* ) pDockW->parentWidget() ->parentWidget();
int cnt = pTab->count();
m_pDockbaseOfTabPage = ( KDockWidget* ) pTab->page( cnt - 2 );
if ( pDockW == m_pDockbaseOfTabPage )
@ -1238,7 +1238,7 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e )
*/
void KMdiMainFrm::closeAllViews()
{
//save the tqchildren first to a list, as removing tqinvalidates our iterator
//save the tqchildren first to a list, as removing invalidates our iterator
TQValueList<KMdiChildView*> tqchildren;
for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() )
{
@ -1306,7 +1306,7 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis
if ( undockCandidate->enableDocking() != KDockWidget::DockNone )
rootDockWindow = undockCandidate;
}
pW = pW->tqparentWidget();
pW = pW->parentWidget();
}
if ( rootDockWindow )
@ -1399,7 +1399,7 @@ void KMdiMainFrm::switchToToplevelMode()
setMainDockWidget( m_pDockbaseAreaOfDocumentViews );
}
// TQApplication::sendPostedEvents(); //why do we need to empty the event queue?
if ( !tqparentWidget() )
if ( !parentWidget() )
{
//if we don't have a tqparent widget ( which i expect we wouldn't )
//make sure we take into account the size of the docks provided by
@ -1560,7 +1560,7 @@ void KMdiMainFrm::switchToChildframeMode()
if ( !pView->isToolView() )
pView->show();
}
if ( ( oldMdiMode == KMdi::ToplevelMode ) && !tqparentWidget() )
if ( ( oldMdiMode == KMdi::ToplevelMode ) && !parentWidget() )
{
setMinimumHeight( m_oldMainFrmMinHeight );
setMaximumHeight( m_oldMainFrmMaxHeight );
@ -1666,7 +1666,7 @@ void KMdiMainFrm::finishTabPageMode()
TQSize mins = pView->tqminimumSize();
TQSize maxs = pView->tqmaximumSize();
TQSize sz = pView->size();
TQWidget* pParent = pView->tqparentWidget();
TQWidget* pParent = pView->parentWidget();
TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset );
m_documentTabWidget->removePage( pView );
pView->reparent( 0, 0, p );
@ -1692,7 +1692,7 @@ void KMdiMainFrm::finishTabPageMode()
void KMdiMainFrm::setupTabbedDocumentViewSpace()
{
// resize to childframe mode size of the mainwindow if we were in toplevel mode
if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() )
if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() )
{
setMinimumHeight( m_oldMainFrmMinHeight );
setMaximumHeight( m_oldMainFrmMaxHeight );
@ -1888,9 +1888,9 @@ void KMdiMainFrm::dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsTo
void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDockWidget::DockPosition dprtmw )
{
KDockWidget* mainDock = getMainDockWidget();
if ( mainDock->tqparentDockTabGroup() )
if ( mainDock->parentDockTabGroup() )
{
mainDock = dynamic_cast<KDockWidget*>( mainDock->tqparentDockTabGroup()->tqparent() );
mainDock = dynamic_cast<KDockWidget*>( mainDock->parentDockTabGroup()->tqparent() );
// FIXME: will likely crash below due to unchecked cast
}
@ -1901,9 +1901,9 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock
}
KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw );
if ( widget && widget->tqparentDockTabGroup() )
if ( widget && widget->parentDockTabGroup() )
{
widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->tqparentDockTabGroup() ->tqparent()) );
widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->parentDockTabGroup() ->tqparent()) );
if ( widget )
{
@ -1934,21 +1934,21 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
KDockWidget *mainDock = getMainDockWidget();
KDockWidget *w = mainDock;
if ( mainDock->tqparentDockTabGroup() )
w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->tqparentDockTabGroup()->tqparent()) );
if ( mainDock->parentDockTabGroup() )
w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup()->tqparent()) );
TQPtrList<KDockWidget> leftRetqparentWidgets;
TQPtrList<KDockWidget> rightRetqparentWidgets;
TQPtrList<KDockWidget> bottomRetqparentWidgets;
TQPtrList<KDockWidget> topRetqparentWidgets;
TQPtrList<KDockWidget> leftReparentWidgets;
TQPtrList<KDockWidget> rightReparentWidgets;
TQPtrList<KDockWidget> bottomReparentWidgets;
TQPtrList<KDockWidget> topReparentWidgets;
if ( mainDock->tqparentDockTabGroup() )
mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->tqparentDockTabGroup() ->tqparent()) );
if ( mainDock->parentDockTabGroup() )
mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->tqparent()) );
findToolViewsDockedToMain( &leftRetqparentWidgets, KDockWidget::DockLeft );
findToolViewsDockedToMain( &rightRetqparentWidgets, KDockWidget::DockRight );
findToolViewsDockedToMain( &bottomRetqparentWidgets, KDockWidget::DockBottom );
findToolViewsDockedToMain( &topRetqparentWidgets, KDockWidget::DockTop );
findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft );
findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight );
findToolViewsDockedToMain( &bottomReparentWidgets, KDockWidget::DockBottom );
findToolViewsDockedToMain( &topReparentWidgets, KDockWidget::DockTop );
mainDock->setEnableDocking( KDockWidget::DockNone ); //::DockCorner);
mainDock->setDockSite( KDockWidget::DockCorner );
@ -2000,10 +2000,10 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
m_topContainer->setDockSite( KDockWidget::DockCenter );
m_bottomContainer->setDockSite( KDockWidget::DockCenter );
dockToolViewsIntoContainers( leftRetqparentWidgets, m_leftContainer );
dockToolViewsIntoContainers( rightRetqparentWidgets, m_rightContainer );
dockToolViewsIntoContainers( bottomRetqparentWidgets, m_bottomContainer );
dockToolViewsIntoContainers( topRetqparentWidgets, m_topContainer );
dockToolViewsIntoContainers( leftReparentWidgets, m_leftContainer );
dockToolViewsIntoContainers( rightReparentWidgets, m_rightContainer );
dockToolViewsIntoContainers( bottomReparentWidgets, m_bottomContainer );
dockToolViewsIntoContainers( topReparentWidgets, m_topContainer );
dockManager->setSpecialLeftDockContainer( m_leftContainer );
@ -2082,7 +2082,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full )
TQSize mins = pView->tqminimumSize();
TQSize maxs = pView->tqmaximumSize();
TQSize sz = pView->size();
TQWidget* pParent = pView->tqparentWidget();
TQWidget* pParent = pView->parentWidget();
TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset );
pView->reparent( 0, 0, p );
pView->reparent( 0, 0, p );
@ -2105,7 +2105,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full )
}
else
{
pParent = pParent->tqparentWidget();
pParent = pParent->parentWidget();
}
}
while ( pParent && !pDockW );
@ -2139,9 +2139,9 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW
Q_UNUSED( size )
KDockWidget * mainDock = getMainDockWidget();
if ( mainDock->tqparentDockTabGroup() )
if ( mainDock->parentDockTabGroup() )
{
mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->tqparentDockTabGroup() ->tqparent()) );
mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->tqparent()) );
}
if ( widgetNames.count() > 0 )
@ -2167,7 +2167,7 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW
}
#if 0
TQWidget *wid = dwpd->tqparentDockTabGroup();
TQWidget *wid = dwpd->parentDockTabGroup();
if ( !wid )
wid = dwpd;
wid->setGeometry( 0, 0, 20, 20 );
@ -2266,10 +2266,10 @@ void KMdiMainFrm::setSysButtonsAtMenuPosition()
{
if ( m_pMainMenuBar == 0L )
return ;
if ( m_pMainMenuBar->tqparentWidget() == 0L )
if ( m_pMainMenuBar->parentWidget() == 0L )
return ;
int menuW = m_pMainMenuBar->tqparentWidget() ->width();
int menuW = m_pMainMenuBar->parentWidget() ->width();
int h;
int y;
if ( frameDecorOfAttachedViews() == KMdi::Win95Look )

4
lib/compatibility/kmdi/qextmdi/kmdimainfrm.h
Unescape View File

@ -297,7 +297,7 @@ private:
// methods
public:
KMdiMainFrm( TQWidget* tqparentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = WType_TopLevel | WDestructiveClose );
KMdiMainFrm( TQWidget* parentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = WType_TopLevel | WDestructiveClose );
virtual ~KMdiMainFrm();
/**
@ -564,7 +564,7 @@ public slots:
* Removes a KMdiChildView from the MDI system and from the main frame`s control.
* Note: The view will be deleted!
*/
virtual void closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar = true );
virtual void closeWindow( KMdiChildView *pWnd, bool layoutTaskBar = true );
/**
* Switches the KMdiTaskBar on and off.

12
lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp
Unescape View File

@ -175,12 +175,12 @@ KMdiTaskBarButton * KMdiTaskBar::addWinButton( KMdiChildView *win_ptr )
TQObject::connect( b, TQT_SIGNAL( clicked( KMdiChildView* ) ), this, TQT_SLOT( setActiveButton( KMdiChildView* ) ) );
TQObject::connect( b, TQT_SIGNAL( leftMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( activateView( KMdiChildView* ) ) );
TQObject::connect( b, TQT_SIGNAL( rightMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( taskbarButtonRightClicked( KMdiChildView* ) ) );
TQObject::connect( b, TQT_SIGNAL( buttonTextChanged( int ) ), this, TQT_SLOT( tqlayoutTaskBar( int ) ) );
TQObject::connect( b, TQT_SIGNAL( buttonTextChanged( int ) ), this, TQT_SLOT( layoutTaskBar( int ) ) );
m_pButtonList->append( b );
b->setToggleButton( true );
b->setText( win_ptr->tabCaption() );
tqlayoutTaskBar();
layoutTaskBar();
m_pStretchSpace = new TQLabel( this, "empty" );
m_pStretchSpace->setText( "" );
@ -202,7 +202,7 @@ void KMdiTaskBar::removeWinButton( KMdiChildView *win_ptr, bool haveToLayoutTask
{
m_pButtonList->removeRef( b );
if ( haveToLayoutTaskBar )
tqlayoutTaskBar();
layoutTaskBar();
}
if ( m_pButtonList->count() == 0 )
{
@ -303,7 +303,7 @@ void KMdiTaskBar::setActiveButton( KMdiChildView *win_ptr )
}
}
void KMdiTaskBar::tqlayoutTaskBar( int taskBarWidth )
void KMdiTaskBar::layoutTaskBar( int taskBarWidth )
{
if ( m_layoutIsPending )
return ;
@ -339,7 +339,7 @@ void KMdiTaskBar::tqlayoutTaskBar( int taskBarWidth )
int tbHandlePixel;
tbHandlePixel = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5;
if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < tqparentWidget() ->width() ) )
if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < parentWidget() ->width() ) )
{
for ( b = m_pButtonList->first();b;b = m_pButtonList->next() )
{
@ -381,7 +381,7 @@ void KMdiTaskBar::resizeEvent( TQResizeEvent* rse )
{
if ( m_pButtonList->count() != 0 )
{
tqlayoutTaskBar( rse->size().width() );
layoutTaskBar( rse->size().width() );
}
}
KToolBar::resizeEvent( rse );

6
lib/compatibility/kmdi/qextmdi/kmditaskbar.h
Unescape View File

@ -88,7 +88,7 @@ signals:
*/
void rightMouseButtonClicked( KMdiChildView* );
/**
* Emitted when the button text has changed. Internally connected with KMdiTaskBar::tqlayoutTaskBar
* Emitted when the button text has changed. Internally connected with KMdiTaskBar::layoutTaskBar
*/
void buttonTextChanged( int );
public slots:
@ -173,7 +173,7 @@ public:
};
protected:
/**
* Reimplemented from its base class to call tqlayoutTaskBar, additionally.
* Reimplemented from its base class to call layoutTaskBar, additionally.
*/
void resizeEvent( TQResizeEvent* );
protected slots:
@ -184,7 +184,7 @@ protected slots:
* fixed width and show() is called for each one.
* If one drags the taskbar to a vertical orientation, the button width is set to 80 pixel.
*/
void tqlayoutTaskBar( int taskBarWidth = 0 );
void layoutTaskBar( int taskBarWidth = 0 );
public slots:
/**
* Pushes the desired taskbar button down (switch on), the old one is released (switched off).

4
lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp
Unescape View File

@ -222,9 +222,9 @@ void KMdiToolViewAccessor::place( KDockWidget::DockPosition pos, TQWidget* pTarg
pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd );
if ( !pTargetDock )
{
if ( pTargetWnd->tqparentWidget() )
if ( pTargetWnd->parentWidget() )
{
pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->tqparentWidget() );
pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->parentWidget() );
}
}
}

4
lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp
Unescape View File

@ -446,13 +446,13 @@ void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style)
void KMultiTabBarButton::hideEvent( TQHideEvent* he) {
TQPushButton::hideEvent(he);
KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(tqparentWidget());
KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget());
if (tb) tb->updateSeparator();
}
void KMultiTabBarButton::showEvent( TQShowEvent* he) {
TQPushButton::showEvent(he);
KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(tqparentWidget());
KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget());
if (tb) tb->updateSeparator();
}

2
lib/compatibility/kmdi/qextmdi/ktabbar.cpp
Unescape View File

@ -48,7 +48,7 @@ KTabBar::KTabBar( TQWidget *tqparent, const char *name )
mActivateDragSwitchTabTimer = new TQTimer( this );
connect( mActivateDragSwitchTabTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( activateDragSwitchTab() ) );
connect(this, TQT_SIGNAL(tqlayoutChanged()), TQT_SLOT(onLayoutChange()));
connect(this, TQT_SIGNAL(layoutChanged()), TQT_SLOT(onLayoutChange()));
}
KTabBar::~KTabBar()

8
lib/compatibility/knewstuff/engine.cpp
Unescape View File

@ -40,8 +40,8 @@
using namespace KNS;
Engine::Engine( KNewStuff *newStuff, const TQString &type,
TQWidget *tqparentWidget ) :
mParentWidget( tqparentWidget ), mDownloadDialog( 0 ),
TQWidget *parentWidget ) :
mParentWidget( parentWidget ), mDownloadDialog( 0 ),
mUploadDialog( 0 ), mProviderDialog( 0 ), mUploadProvider( 0 ),
mNewStuff( newStuff ), mType( type )
{
@ -51,8 +51,8 @@ Engine::Engine( KNewStuff *newStuff, const TQString &type,
}
Engine::Engine( KNewStuff *newStuff, const TQString &type,
const TQString &providerList, TQWidget *tqparentWidget ) :
mParentWidget( tqparentWidget ),
const TQString &providerList, TQWidget *parentWidget ) :
mParentWidget( parentWidget ),
mDownloadDialog( 0 ), mUploadDialog( 0 ),
mProviderDialog( 0 ), mUploadProvider( 0 ),
mProviderList( providerList ), mNewStuff( newStuff ),

10
lib/compatibility/knewstuff/engine.h
Unescape View File

@ -58,18 +58,18 @@ class Engine : public TQObject
@param newStuff a KNewStuff object
@param type the Hotstuff data type such as "korganizer/calendar"
@param tqparentWidget the tqparent window
@param parentWidget the tqparent window
*/
Engine( KNewStuff *newStuff, const TQString &type, TQWidget *tqparentWidget = 0 );
Engine( KNewStuff *newStuff, const TQString &type, TQWidget *parentWidget = 0 );
/**
Constructor.
@param newStuff a KNewStuff object
@param type the Hotstuff data type such as "korganizer/calendar"
@param providerList the URL of the provider list
@param tqparentWidget the tqparent window
@param parentWidget the tqparent window
*/
Engine( KNewStuff *newStuff, const TQString &type, const TQString &providerList, TQWidget *tqparentWidget = 0 );
Engine( KNewStuff *newStuff, const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 );
/**
Destructor.
@ -88,7 +88,7 @@ class Engine : public TQObject
@return tqparent widget
*/
TQWidget *tqparentWidget() const { return mParentWidget; }
TQWidget *parentWidget() const { return mParentWidget; }
/**
Initiates the download process, retrieving provider lists and invoking

12
lib/compatibility/knewstuff/knewstuff.cpp
Unescape View File

@ -39,14 +39,14 @@ KAction* KNS::standardAction(const TQString& what,
0, recvr, slot, tqparent, name);
}
KNewStuff::KNewStuff( const TQString &type, TQWidget *tqparentWidget )
KNewStuff::KNewStuff( const TQString &type, TQWidget *parentWidget )
{
mEngine = new Engine( this, type, tqparentWidget );
mEngine = new Engine( this, type, parentWidget );
}
KNewStuff::KNewStuff( const TQString &type, const TQString &providerList, TQWidget *tqparentWidget )
KNewStuff::KNewStuff( const TQString &type, const TQString &providerList, TQWidget *parentWidget )
{
mEngine = new Engine( this, type, providerList, tqparentWidget );
mEngine = new Engine( this, type, providerList, parentWidget );
}
TQString KNewStuff::type() const
@ -54,9 +54,9 @@ TQString KNewStuff::type() const
return mEngine->type();
}
TQWidget *KNewStuff::tqparentWidget() const
TQWidget *KNewStuff::parentWidget() const
{
return mEngine->tqparentWidget();
return mEngine->parentWidget();
}
KNewStuff::~KNewStuff()

10
lib/compatibility/knewstuff/knewstuff.h
Unescape View File

@ -74,10 +74,10 @@ class KDE_EXPORT KNewStuff
@param type type of data to be handled, should be something like
korganizer/calendar, kword/template, kdesktop/wallpaper
@param tqparentWidget tqparent widget of dialogs opened by the KNewStuff
@param parentWidget tqparent widget of dialogs opened by the KNewStuff
engine
*/
KNewStuff( const TQString &type, TQWidget *tqparentWidget = 0 );
KNewStuff( const TQString &type, TQWidget *parentWidget = 0 );
/**
Constructor.
@ -85,10 +85,10 @@ class KDE_EXPORT KNewStuff
@param type type of data to be handled, should be something like
korganizer/calendar, kword/template, kdesktop/wallpaper
@param providerList the URL of the provider list
@param tqparentWidget tqparent widget of dialogs opened by the KNewStuff
@param parentWidget tqparent widget of dialogs opened by the KNewStuff
engine
*/
KNewStuff( const TQString &type, const TQString &providerList, TQWidget *tqparentWidget = 0 );
KNewStuff( const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 );
virtual ~KNewStuff();
/**
@ -99,7 +99,7 @@ class KDE_EXPORT KNewStuff
/**
Return tqparent widget.
*/
TQWidget *tqparentWidget() const;
TQWidget *parentWidget() const;
/**
Start download process.

2
lib/compatibility/knewstuff/knewstuffgeneric.cpp
Unescape View File

@ -129,7 +129,7 @@ TQString KNewStuffGeneric::downloadDestination( KNS::Entry *entry )
TQString file = destinationPath(entry);
if ( KStandardDirs::exists( file ) ) {
int result = KMessageBox::warningContinueCancel( tqparentWidget(),
int result = KMessageBox::warningContinueCancel( parentWidget(),
i18n("The file '%1' already exists. Do you want to override it?")
.tqarg( file ),
TQString(), i18n("Overwrite") );

16
lib/compatibility/knewstuff/knewstuffsecure.cpp
Unescape View File

@ -33,8 +33,8 @@
using namespace KNS;
KNewStuffSecure::KNewStuffSecure(const TQString &type, TQWidget *tqparentWidget)
: KNewStuff(type, tqparentWidget)
KNewStuffSecure::KNewStuffSecure(const TQString &type, TQWidget *parentWidget)
: KNewStuff(type, parentWidget)
{
m_tempDir = 0L;
connect(engine(), TQT_SIGNAL(uploadFinished(bool)), TQT_SLOT(slotUploadFinished(bool)));
@ -80,7 +80,7 @@ bool KNewStuffSecure::install(const TQString &fileName)
} else
ok = false;
if (!ok)
KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded resource tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Resource Installation Error"));
KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded resource tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Resource Installation Error"));
return ok;
}
@ -134,10 +134,10 @@ void KNewStuffSecure::slotValidated(int result)
if (!valid)
{
signatureStr.prepend( "<br>");
if (KMessageBox::warningContinueCancel(tqparentWidget(), i18n("<qt>There is a problem with the resource file you have downloaded. The errors are :<b>%1</b><br>%2<br><br>Installation of the resource is <b>not recommended</b>.<br><br>Do you want to proceed with the installation?</qt>").tqarg(errorString).tqarg(signatureStr), i18n("Problematic Resource File")) == KMessageBox::Continue)
if (KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>There is a problem with the resource file you have downloaded. The errors are :<b>%1</b><br>%2<br><br>Installation of the resource is <b>not recommended</b>.<br><br>Do you want to proceed with the installation?</qt>").tqarg(errorString).tqarg(signatureStr), i18n("Problematic Resource File")) == KMessageBox::Continue)
valid = true;
} else
KMessageBox::information(tqparentWidget(), i18n("<qt>%1<br><br>Press OK to install it.</qt>").tqarg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information");
KMessageBox::information(parentWidget(), i18n("<qt>%1<br><br>Press OK to install it.</qt>").tqarg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information");
if (valid)
{
installResource();
@ -187,12 +187,12 @@ void KNewStuffSecure::slotFileSigned(int result)
{
if (result == 0)
{
KMessageBox::error(tqparentWidget(), i18n("The signing failed for unknown reason."));
KMessageBox::error(parentWidget(), i18n("The signing failed for unknown reason."));
} else
{
if (result & Security::BAD_PASSPHRASE)
{
if (KMessageBox::warningContinueCancel(tqparentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel)
if (KMessageBox::warningContinueCancel(parentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel)
{
disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int)));
removeTempDirectory();
@ -231,7 +231,7 @@ void KNewStuffSecure::removeTempDirectory()
{
if (m_tempDir)
{
KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), tqparentWidget());
KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), parentWidget());
delete m_tempDir;
m_tempDir = 0L;
}

4
lib/compatibility/knewstuff/knewstuffsecure.h
Unescape View File

@ -47,10 +47,10 @@ public:
@param type type of data to be handled, should be something like
korganizer/calendar, kword/template, kdesktop/wallpaper
@param tqparentWidget tqparent widget of dialogs opened by the KNewStuff
@param parentWidget tqparent widget of dialogs opened by the KNewStuff
engine
*/
KNewStuffSecure(const TQString &type, TQWidget *tqparentWidget=0);
KNewStuffSecure(const TQString &type, TQWidget *parentWidget=0);
virtual ~KNewStuffSecure();
/** Installs the downloaded resource. Do not call or reimplement directly.

4
lib/compatibility/knewstuff/provider.cpp
Unescape View File

@ -141,8 +141,8 @@ TQDomElement Provider::createDomElement( TQDomDocument &doc, TQDomElement &tqpar
}
ProviderLoader::ProviderLoader( TQWidget *tqparentWidget ) :
mParentWidget( tqparentWidget )
ProviderLoader::ProviderLoader( TQWidget *parentWidget ) :
mParentWidget( parentWidget )
{
mProviders.setAutoDelete( true );
}

4
lib/compatibility/knewstuff/provider.h
Unescape View File

@ -169,9 +169,9 @@ class ProviderLoader : public TQObject
/**
* Constructor.
*
* @param tqparentWidget the tqparent widget
* @param parentWidget the tqparent widget
*/
ProviderLoader( TQWidget *tqparentWidget );
ProviderLoader( TQWidget *parentWidget );
/**
* Starts asynchronously loading the list of providers of the

2
quanta/components/csseditor/csseditors.ui
Unescape View File

@ -404,7 +404,7 @@
<slot>accept()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
</includehints>

2
quanta/components/csseditor/cssselectors.ui
Unescape View File

@ -975,7 +975,7 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>

2
quanta/components/csseditor/encodingselectors.ui
Unescape View File

@ -111,5 +111,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/components/csseditor/fontfamilychoosers.ui
Unescape View File

@ -429,7 +429,7 @@
<slot>accept()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

4
quanta/components/csseditor/stylesheetparser.cpp
Unescape View File

@ -20,7 +20,7 @@
#include <kdebug.h>
static const TQString msg1(i18n("has not been closed")),
msg2(i18n("needs an opening tqparenthesis "));
msg2(i18n("needs an opening parenthesis "));
stylesheetParser::stylesheetParser(const TQString& s){
m_styleSheet = s;
@ -87,7 +87,7 @@ void stylesheetParser::parseComment(){
}
}
unsigned int stylesheetParser::numberOfParenthesisInAParenthesisBlock(tqparenthesisKind p, const TQString& b){
unsigned int stylesheetParser::numberOfParenthesisInAParenthesisBlock(parenthesisKind p, const TQString& b){
TQChar searchFor = '{';
if (p == closed)
searchFor = '}';

4
quanta/components/csseditor/stylesheetparser.h
Unescape View File

@ -31,7 +31,7 @@ class stylesheetParser : public TQObject{
TQ_OBJECT
private:
enum tqparenthesisKind { opened, closed };
enum parenthesisKind { opened, closed };
TQString m_styleSheet;
bool m_stopProcessing;
unsigned int m_orderNumber;
@ -41,7 +41,7 @@ class stylesheetParser : public TQObject{
void parseAtRules1();
void parseAtRules2();
int whiteSpaces(int);
unsigned int numberOfParenthesisInAParenthesisBlock(tqparenthesisKind p, const TQString& b);
unsigned int numberOfParenthesisInAParenthesisBlock(parenthesisKind p, const TQString& b);
public:
stylesheetParser(const TQString& s);

2
quanta/components/cvsservice/cvscommitdlgs.ui
Unescape View File

@ -143,7 +143,7 @@
<tabstop>okButton</tabstop>
<tabstop>cancelButton</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistbox.h</includehint>
</includehints>

2
quanta/components/cvsservice/cvsupdatetodlgs.ui
Unescape View File

@ -194,5 +194,5 @@
<slot>accept()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/components/debugger/conditionalbreakpointdialogs.ui
Unescape View File

@ -320,7 +320,7 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>

2
quanta/components/debugger/dbgp/dbgpsettingss.ui
Unescape View File

@ -721,7 +721,7 @@
<slot>checkLocalProject_toggled(bool)</slot>
<slot>slotLocalProjectToggle(bool)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>ktextbrowser.h</includehint>
</includehints>

20
quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
Unescape View File

@ -705,7 +705,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("localproject").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("localproject");
node.appendChild( el );
if(set.checkLocalProject->isChecked())
@ -725,7 +725,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("localbasedir").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("localbasedir");
node.appendChild( el );
el.appendChild( node.ownerDocument().createTextNode(m_localBasedir) );
@ -734,7 +734,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("serverbasedir").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("serverbasedir");
node.appendChild( el );
if(debuggerInterface())
@ -743,7 +743,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("listenport").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("listenport");
node.appendChild( el );
m_listenPort = set.lineServerListenPort->text();
@ -751,7 +751,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("startsession").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("startsession");
node.appendChild( el );
m_startsession = set.lineStartSession->text();
@ -759,7 +759,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("defaultexecutionstate").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("defaultexecutionstate");
node.appendChild( el );
if(set.comboDefaultExecutionState->currentItem() == 0)
@ -776,7 +776,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("errortqmask").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("errortqmask");
node.appendChild( el );
m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0)
@ -790,7 +790,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
// Profiler
el = node.namedItem("profilerfilename").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("profilerfilename");
node.appendChild( el );
m_profilerFilename = set.lineProfilerFilename->text();
@ -798,7 +798,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("profilerfilename_map").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("profilerfilename_map");
node.appendChild( el );
m_profilerMapFilename = (set.checkProfilerMapFilename->isChecked() ? true : false);
@ -806,7 +806,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("profiler_autoopen").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("profiler_autoopen");
node.appendChild( el );
m_profilerAutoOpen = (set.checkProfilerAutoOpen->isChecked() ? true : false);

4
quanta/components/debugger/debuggermanager.cpp
Unescape View File

@ -781,7 +781,7 @@ void DebuggerManager::saveProperties( )
// (Re)create breakpoints section
TQDomNode nodeBreakpoints = nodeDbg.namedItem("breakpoints");
if(!nodeBreakpoints.isNull())
nodeBreakpoints.tqparentNode().removeChild(nodeBreakpoints);
nodeBreakpoints.parentNode().removeChild(nodeBreakpoints);
if(m_breakpointList->count() > 0)
{
@ -818,7 +818,7 @@ void DebuggerManager::saveProperties( )
// (Re)create watches section
TQDomNode nodeWatches = nodeDbg.namedItem("watches");
if(!nodeWatches.isNull())
nodeWatches.tqparentNode().removeChild(nodeWatches);
nodeWatches.parentNode().removeChild(nodeWatches);
if(m_debuggerui->watches()->first())
{

2
quanta/components/debugger/debuggervariablesets.ui
Unescape View File

@ -181,5 +181,5 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/components/debugger/gubed/gubedsettingss.ui
Unescape View File

@ -755,7 +755,7 @@
<Q_SLOTS>
<slot specifier="pure virtual">slotUseProxyToggle( bool )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>ktextbrowser.h</includehint>
</includehints>

20
quanta/components/debugger/gubed/quantadebuggergubed.cpp
Unescape View File

@ -878,7 +878,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("serverhost").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("serverhost");
node.appendChild( el );
m_serverHost = set.lineServerHost->text();
@ -886,7 +886,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("serverport").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("serverport");
node.appendChild( el );
m_serverPort = set.lineServerPort->text();
@ -894,7 +894,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("localbasedir").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("localbasedir");
node.appendChild( el );
m_localBasedir = set.lineLocalBasedir->text();
@ -904,7 +904,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("serverbasedir").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("serverbasedir");
node.appendChild( el );
m_serverBasedir = set.lineServerBasedir->text();
@ -914,7 +914,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("useproxy").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("useproxy");
node.appendChild( el );
m_useproxy = set.checkUseProxy->isChecked();
@ -922,7 +922,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("listenport").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("listenport");
node.appendChild( el );
m_listenPort = set.lineServerListenPort->text();
@ -930,7 +930,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("startsession").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("startsession");
node.appendChild( el );
m_startsession = set.lineStartSession->text();
@ -938,7 +938,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("defaultexecutionstate").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("defaultexecutionstate");
node.appendChild( el );
m_defaultExecutionState = (State)set.comboDefaultExecutionState->currentItem();
@ -947,7 +947,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("displaydelay").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("displaydelay");
node.appendChild( el );
m_displaydelay = set.sliderDisplayDelay->value();
@ -955,7 +955,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("errortqmask").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("errortqmask");
node.appendChild( el );
m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerGubed::Notice : 0)

2
quanta/components/debugger/pathmapperdialogs.ui
Unescape View File

@ -338,7 +338,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
<Q_SLOTS>
<slot>slotHistoryclicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kled.h</includehint>
</includehints>

2
quanta/components/framewizard/fmfpeditors.ui
Unescape View File

@ -537,5 +537,5 @@
</connection>
</connections>
<pixmapinproject/>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/components/framewizard/fmrceditors.ui
Unescape View File

@ -145,5 +145,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/components/framewizard/framewizards.ui
Unescape View File

@ -362,7 +362,7 @@
</connection>
</connections>
<pixmapinproject/>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>visualframeeditor.h</includehint>
</includehints>

2
quanta/components/framewizard/treenode.cpp
Unescape View File

@ -114,7 +114,7 @@ TQString tree::addChildNode(const TQString &l){
}
bool tree::insertChildNode(const TQString &l){
TQString tqparent = findNode(l)->tqparentLabel();
TQString tqparent = findNode(l)->parentLabel();
int pos=findNode( tqparent )->childPosition( findNode(l) );
++nodeId;
treeNode *newNode = new treeNode(TQString::number(nodeId,10),tqparent);

2
quanta/components/framewizard/treenode.h
Unescape View File

@ -49,7 +49,7 @@ class treeNode {
int childPosition(treeNode* n){ return m_tqchildrenList.tqfind(n); }
bool insertChild(unsigned int pos, treeNode* n) { return m_tqchildrenList.insert( pos, n); }
TQString label() const { return m_label; }
TQString tqparentLabel() const { return m_parentLabel; }
TQString parentLabel() const { return m_parentLabel; }
SplitType splitType() const { return m_splitType; }
TQPtrList<treeNode> tqchildrenList() { return m_tqchildrenList; }

46
quanta/components/framewizard/visualframeeditor.cpp
Unescape View File

@ -76,17 +76,17 @@ void VisualFrameEditor::split(const TQString &l, int n, SplitType type) {
setGeometries(l);
}
else {
TQString tqparentLabel=m_internalTree->findNode(l)->tqparentLabel();
SplitType tqparentSplit=m_internalTree->findNode(tqparentLabel)->splitType();
if( tqparentSplit != type ) {
TQString parentLabel=m_internalTree->findNode(l)->parentLabel();
SplitType parentSplit=m_internalTree->findNode(parentLabel)->splitType();
if( parentSplit != type ) {
m_internalTree->findNode(l)->setSplitType(type);
for(int i = 1; i<=n; i++) m_internalTree->addChildNode(l);
setGeometries(l);
}
else {
for(int i = 1; i<=n; i++) m_internalTree->insertChildNode(l);
m_internalTree->findNode(tqparentLabel)->removeChildNode(l,true);
setGeometries(m_internalTree->findNode(tqparentLabel)->label());
m_internalTree->findNode(parentLabel)->removeChildNode(l,true);
setGeometries(m_internalTree->findNode(parentLabel)->label());
}
}
}
@ -246,23 +246,23 @@ void VisualFrameEditor::paintEvent ( TQPaintEvent * ){
void VisualFrameEditor::removeNode(const TQString &l){
if( l == m_internalTree->root()->label() ) m_internalTree->reset();//trying to remove root node is equivalent to reinitialize
else {
TQString tqparentLabel=m_internalTree->findNode(l)->tqparentLabel();
if(m_internalTree->findNode(tqparentLabel)->countChildren()>=3)
m_internalTree->removeChildNode(tqparentLabel,l,true);
TQString parentLabel=m_internalTree->findNode(l)->parentLabel();
if(m_internalTree->findNode(parentLabel)->countChildren()>=3)
m_internalTree->removeChildNode(parentLabel,l,true);
else {
m_internalTree->removeChildNode(tqparentLabel,l,true);
if( !m_internalTree->findNode(tqparentLabel)->firstChild()->hasChildren() ){ //final nodes
TQMap<TQString,TQString> map = m_internalTree->findNode(tqparentLabel)->firstChild()->atts()->attributeMap();
m_internalTree->findNode(tqparentLabel)->removeChildren();
m_internalTree->findNode(tqparentLabel)->atts()->setAllAttributes( map ) ;
m_internalTree->findNode(tqparentLabel)->setSplitType(NONE);
m_internalTree->removeChildNode(parentLabel,l,true);
if( !m_internalTree->findNode(parentLabel)->firstChild()->hasChildren() ){ //final nodes
TQMap<TQString,TQString> map = m_internalTree->findNode(parentLabel)->firstChild()->atts()->attributeMap();
m_internalTree->findNode(parentLabel)->removeChildren();
m_internalTree->findNode(parentLabel)->atts()->setAllAttributes( map ) ;
m_internalTree->findNode(parentLabel)->setSplitType(NONE);
}
else {
TQPtrList<treeNode> list = m_internalTree->findNode(tqparentLabel)->firstChild()->tqchildrenList();
if( tqparentLabel != m_internalTree->root()->label() ) {
TQString grandParentLabel = m_internalTree->findNode(tqparentLabel)->tqparentLabel();
m_internalTree->removeChildNode( tqparentLabel,m_internalTree->findNode(tqparentLabel)->firstChild()->label(),false );
m_internalTree->removeChildNode( grandParentLabel ,tqparentLabel, true );
TQPtrList<treeNode> list = m_internalTree->findNode(parentLabel)->firstChild()->tqchildrenList();
if( parentLabel != m_internalTree->root()->label() ) {
TQString grandParentLabel = m_internalTree->findNode(parentLabel)->parentLabel();
m_internalTree->removeChildNode( parentLabel,m_internalTree->findNode(parentLabel)->firstChild()->label(),false );
m_internalTree->removeChildNode( grandParentLabel ,parentLabel, true );
treeNode *node;
for ( node = list.first(); node; node = list.next() ) {
node->setParentLabel(grandParentLabel);
@ -270,12 +270,12 @@ void VisualFrameEditor::removeNode(const TQString &l){
}
}
else {
m_internalTree->findNode(tqparentLabel)->setSplitType( m_internalTree->findNode(tqparentLabel)->firstChild()->splitType() );
m_internalTree->removeChildNode( tqparentLabel,m_internalTree->findNode(tqparentLabel)->firstChild()->label(),false );
m_internalTree->findNode(parentLabel)->setSplitType( m_internalTree->findNode(parentLabel)->firstChild()->splitType() );
m_internalTree->removeChildNode( parentLabel,m_internalTree->findNode(parentLabel)->firstChild()->label(),false );
treeNode *node;
for ( node = list.first(); node; node = list.next() ) {
node->setParentLabel(tqparentLabel);
m_internalTree->findNode(tqparentLabel)->addChildNode(node);
node->setParentLabel(parentLabel);
m_internalTree->findNode(parentLabel)->addChildNode(node);
}
}
}

2
quanta/components/tableeditor/tableeditors.ui
Unescape View File

@ -638,5 +638,5 @@
<tabstop>footerColSpinBox</tabstop>
<tabstop>footerTableData</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

14
quanta/dialogs/actionconfigdialog.cpp
Unescape View File

@ -630,7 +630,7 @@ void ActionConfigDialog::saveCurrentAction()
{
currentAction->unplug(tb->page(i));
currentAction->unplug(p_toolbar->menu);
node.tqparentNode().removeChild(node);
node.parentNode().removeChild(node);
TQListViewItemIterator iter(actionTreeView);
while (iter.current())
{
@ -816,18 +816,18 @@ void ActionConfigDialog::slotNewAction()
actionTreeView->setCurrentItem(item);
} else
{
TQListViewItem *tqparentItem = currentItem->tqparent();
if (!tqparentItem)
tqparentItem = currentItem;
TQListViewItem *parentItem = currentItem->tqparent();
if (!parentItem)
parentItem = currentItem;
item = new KListViewItem(tqparentItem, currentItem);
item = new KListViewItem(parentItem, currentItem);
item->setText(0, actionText);
item->setText(2, currentAction->name());
item->setPixmap(0, SmallIcon("ball"));
actionTreeView->setCurrentItem(item);
if (tqparentItem != allActionsItem)
if (parentItem != allActionsItem)
{
toolbarListBox->insertItem(tqparentItem->text(0));
toolbarListBox->insertItem(parentItem->text(0));
toolbarListBox->setCurrentItem(0);
toolbarListBox->setSelected(0, true);
}

2
quanta/dialogs/actionconfigdialogs.ui
Unescape View File

@ -990,7 +990,7 @@
<slot>slotToggled(bool)</slot>
<slot>slotTextChanged()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>kicondialog.h</includehint>

2
quanta/dialogs/casewidget.ui
Unescape View File

@ -104,5 +104,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/dialogs/debuggeroptionss.ui
Unescape View File

@ -137,5 +137,5 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/dialogs/dirtydialog.ui
Unescape View File

@ -150,5 +150,5 @@
<tabstop>buttonIgnore</tabstop>
<tabstop>buttonLoad</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/dialogs/donationdialog.ui
Unescape View File

@ -146,7 +146,7 @@ is the future of software, but it is no guarantee of success. How many open sour
<Q_SLOTS>
<slot>init()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>ktextbrowser.h</includehint>

2
quanta/dialogs/dtdselectdialog.ui
Unescape View File

@ -108,5 +108,5 @@ Dialog message2:</string>
<Q_SLOTS>
<slot>init()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

8
quanta/dialogs/dtepeditdlg.cpp
Unescape View File

@ -354,7 +354,7 @@ void DTEPEditDlg::readStructures()
group.hasFileName = m_config->readBoolEntry("HasFileName", false);
group.fileNameRx = m_config->readEntry("FileNameRx");
group.appendToTags = m_config->readBoolEntry("AppendToTags", false);
group.tqparentGroup = m_config->readEntry("ParentGroup");
group.parentGroup = m_config->readEntry("ParentGroup");
group.definitionRx = m_config->readEntry("DefinitionRx");
group.definitionRxMinimal = m_config->readBoolEntry("DefinitionRx_Minimal", false);
group.usageRx = m_config->readEntry("UsageRx");
@ -397,7 +397,7 @@ void DTEPEditDlg::writeStructures(KConfig *config)
config->writeEntry("AppendToTags", group.appendToTags);
if (m_family == 1)
{
writeEntry(config, "ParentGroup", group.tqparentGroup);
writeEntry(config, "ParentGroup", group.parentGroup);
writeEntry(config, "DefinitionRx", group.definitionRx);
config->writeEntry("DefinitionRx_Minimal", group.definitionRxMinimal);
writeEntry(config, "UsageRx", group.usageRx);
@ -453,7 +453,7 @@ void DTEPEditDlg::slotEditStructGroup()
structDlg.hasFilename->setChecked(group.hasFileName);
structDlg.fileNameRxEdit->setText(group.fileNameRx);
structDlg.appendToTags->setChecked(group.appendToTags);
structDlg.tqparentGroupEdit->setText(group.tqparentGroup);
structDlg.parentGroupEdit->setText(group.parentGroup);
for (int i = 0; i < structDlg.tagTypeCombo->count(); i++)
{
if (structDlg.tagTypeCombo->text(i) == group.tagType)
@ -513,7 +513,7 @@ StructGroup DTEPEditDlg::readFromStructDlg(DTEPStructureEditDlgS *structDlg)
group.hasFileName = structDlg->hasFilename->isChecked();
group.fileNameRx = structDlg->fileNameRxEdit->text();
group.appendToTags = structDlg->appendToTags->isChecked();
group.tqparentGroup = structDlg->tqparentGroupEdit->text();
group.parentGroup = structDlg->parentGroupEdit->text();
group.tagType = structDlg->tagTypeCombo->currentText();
group.definitionRx = structDlg->definitionRxEdit->text();
group.definitionRxMinimal = structDlg->definitionRxMinimal->isChecked();

2
quanta/dialogs/dtepeditdlg.h
Unescape View File

@ -37,7 +37,7 @@ struct StructGroup {
bool hasFileName;
TQString fileNameRx;
bool appendToTags;
TQString tqparentGroup;
TQString parentGroup;
TQString definitionRx;
bool definitionRxMinimal;
TQString usageRx;

2
quanta/dialogs/dtepeditdlgs.ui
Unescape View File

@ -1963,5 +1963,5 @@ Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
<slot>slotDeleteStructGroup()</slot>
<slot>slotFamilyChanged(int)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

6
quanta/dialogs/dtepstructureeditdlgs.ui
Unescape View File

@ -358,7 +358,7 @@ Example 3:&lt;br&gt;
</widget>
<widget class="KLineEdit" row="0" column="1" rowspan="1" colspan="4">
<property name="name">
<cstring>tqparentGroupEdit</cstring>
<cstring>parentGroupEdit</cstring>
</property>
<property name="toolTip" stdset="0">
<string>The name of the group that may be the tqparent of this</string>
@ -624,7 +624,7 @@ The first captured area (between "&lt;b&gt;(&lt;/b&gt;" and "&lt;b&gt;)&lt;/b&gt
<tabstop>hasFilename</tabstop>
<tabstop>fileNameRxEdit</tabstop>
<tabstop>appendToTags</tabstop>
<tabstop>tqparentGroupEdit</tabstop>
<tabstop>parentGroupEdit</tabstop>
<tabstop>tagTypeCombo</tabstop>
<tabstop>definitionRxEdit</tabstop>
<tabstop>definitionRxMinimal</tabstop>
@ -639,7 +639,7 @@ The first captured area (between "&lt;b&gt;(&lt;/b&gt;" and "&lt;b&gt;)&lt;/b&gt
<tabstop>variableGroup</tabstop>
<tabstop>classGroup</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kicondialog.h</includehint>
</includehints>

2
quanta/dialogs/fourbuttonmessagebox.ui
Unescape View File

@ -160,5 +160,5 @@
<functions>
<function specifier="non virtual" returnType="int">status()</function>
</functions>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/dialogs/loadentitydlgs.ui
Unescape View File

@ -68,5 +68,5 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/dialogs/settings/abbreviations.ui
Unescape View File

@ -346,7 +346,7 @@
<slot>slotRemoveDTEP()</slot>
<slot>slotNewGroup()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>klistbox.h</includehint>

2
quanta/dialogs/settings/codetemplatedlgs.ui
Unescape View File

@ -77,5 +77,5 @@
<slot>reject()</slot>
<slot>pushButton4_clicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/dialogs/settings/filemasks.cpp
Unescape View File

@ -31,7 +31,7 @@ FileMasks::FileMasks(TQWidget *tqparent, const char *name)
FileMasks::~FileMasks(){
}
/** set tqmasks to default */
/** set masks to default */
void FileMasks::setToDefault()
{
KMimeType::List list = KMimeType::allMimeTypes();

2
quanta/dialogs/settings/filemaskss.ui
Unescape View File

@ -332,5 +332,5 @@
<tabstop>reloadProject</tabstop>
<tabstop>reloadFiles</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/dialogs/settings/parseroptionsui.ui
Unescape View File

@ -310,5 +310,5 @@
<tabstop>refreshFrequency</tabstop>
<tabstop>spinExpand</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/dialogs/settings/previewoptionss.ui
Unescape View File

@ -276,5 +276,5 @@
<tabstop>radioNoCloseButtons</tabstop>
<tabstop>radioDelayedCloseButtons</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/dialogs/settings/styleoptionss.ui
Unescape View File

@ -197,5 +197,5 @@ We suggest to leave this option off and use an tqunicode or locale encoding for
<tabstop>tagAutoClose</tabstop>
<tabstop>useAutoCompletion</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/dialogs/specialchardialogs.ui
Unescape View File

@ -145,7 +145,7 @@
<tabstop>buttonChar</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klistbox.h</includehint>

8
quanta/dialogs/tagdialogs/tagdialog.cpp
Unescape View File

@ -148,7 +148,7 @@ void TagDialog::parseTag()
TQDomDocument doc;
if (dtdTag->name().lower() == "img") //NOTE: HTML specific code!
{
mainDlg = new TagImgDlg(dtdTag->tqparentDTD, this);
mainDlg = new TagImgDlg(dtdTag->parentDTD, this);
((TagImgDlg *)mainDlg)->writeAttributes( dict );
}
//read the tag file it is available
@ -164,7 +164,7 @@ void TagDialog::parseTag()
{
TQDomNode n = nodeList.item(i);
TQString nodeTagName = n.toElement().attribute("name");
if (!dtdTag->tqparentDTD->caseSensitive)
if (!dtdTag->parentDTD->caseSensitive)
nodeTagName = nodeTagName.upper();
if (nodeTagName == tagName && n.toElement().elementsByTagName("attr").count() > 0) //read a tag
{
@ -192,7 +192,7 @@ void TagDialog::parseTag()
addTab( mainDlg, i18n("Main") );
}
KConfig *dtdConfig = new KConfig(dtdTag->tqparentDTD->fileName);
KConfig *dtdConfig = new KConfig(dtdTag->parentDTD->fileName);
dtdConfig->setGroup("General");
int numOfPages = dtdConfig->readNumEntry("NumOfPages");
extraPageList = new TQPtrList<Tagxml>();
@ -429,7 +429,7 @@ void TagDialog::insertTag(Document *w, bool insertInLine)
TQString newTag = getAttributeString();
newTag = TQString("<")+QuantaCommon::tagCase(dtdTag->name())+newTag;
if ( dtdTag->tqparentDTD->singleTagStyle == "xml" &&
if ( dtdTag->parentDTD->singleTagStyle == "xml" &&
(dtdTag->isSingle() || (!qConfig.closeOptionalTags && dtdTag->isOptional()))
)
{

2
quanta/dialogs/tagdialogs/tagmail.ui
Unescape View File

@ -126,5 +126,5 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/dialogs/tagdialogs/tagmisc.ui
Unescape View File

@ -64,5 +64,5 @@
<tabstop>elementName</tabstop>
<tabstop>addClosingTag</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/dialogs/tagdialogs/tagxml.cpp
Unescape View File

@ -47,7 +47,7 @@ Tagxml::~Tagxml()
void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag)
{
m_dtd = dtdTag->tqparentDTD;
m_dtd = dtdTag->parentDTD;
m_dtdTag = dtdTag;
TQGridLayout *grid = new TQGridLayout( this );
grid->setSpacing( 13 );

2
quanta/messages/annotationoutput.cpp
Unescape View File

@ -236,7 +236,7 @@ void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap<ui
int line = el.attribute("line").toInt(&ok, 10);
if (!annotations.tqcontains(line) || (annotations[line].first != text))
{
n.tqparentNode().removeChild(n);
n.parentNode().removeChild(n);
modified = true;
} else
annotations.remove(line);

2
quanta/parsers/dtd/dtepcreationdlg.ui
Unescape View File

@ -148,5 +148,5 @@
<tabstop>defaultExtension</tabstop>
<tabstop>caseSensitive</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

4
quanta/parsers/node.h
Unescape View File

@ -37,7 +37,7 @@ struct GroupElement{
/* The tag which point to the actual place in the node */
Tag *tag;
/*The tqparent node indicating the beginning of a structure */
Node *tqparentNode;
Node *parentNode;
bool global;
bool deleted;
TQString type;
@ -99,7 +99,7 @@ public:
TQString nodeName();
TQString nodeValue();
void setNodeValue(const TQString &value);
Node* tqparentNode() {return tqparent;}
Node* parentNode() {return tqparent;}
Node* firstChild() {return child;}
Node* lastChild();
Node* DOMpreviousSibling() {return prev;}

92
quanta/parsers/parser.cpp
Unescape View File

@ -115,11 +115,11 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
bool nodeFound = false;
bool goUp;
Node *rootNode = 0L;
Node *tqparentNode = a_node;
Node *parentNode = a_node;
Node *currentNode = a_node;
if (currentNode && (currentNode->tag->type != Tag::XmlTag ||
currentNode->tag->single))
tqparentNode = currentNode->tqparent;
parentNode = currentNode->tqparent;
Tag *tag = 0L;
TQTag *qTag = 0L;
textLine.append(write->text(startLine, startCol, startLine, write->editIf->lineLength(startLine)));
@ -144,13 +144,13 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
if ( specialStartPos != -1 &&
(specialStartPos <= tagStartPos || tagStartPos == -1) )
{
currentNode = ParserCommon::createTextNode(write, currentNode, line, specialStartPos, tqparentNode);
currentNode = ParserCommon::createTextNode(write, currentNode, line, specialStartPos, parentNode);
if (!rootNode)
rootNode = currentNode;
TQString foundText = m_dtd->specialAreaStartRx.cap();
//create a toplevel node for the special area
AreaStruct area(line, specialStartPos, line, specialStartPos + foundText.length() - 1);
Node *node = ParserCommon::createScriptTagNode(write, area, foundText, m_dtd, tqparentNode, currentNode);
Node *node = ParserCommon::createScriptTagNode(write, area, foundText, m_dtd, parentNode, currentNode);
if (node->tqparent && node->prev == node->tqparent) //some strange cases, but it's possible, eg.: <a href="<? foo ?>""></a><input size="<? foo ?>" >
{
node->prev->next = 0L;
@ -266,18 +266,18 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
if (m_dtd->specialTags.tqcontains(tag->name.lower()) && !tag->single)
{
//TODO: handle goUp here
Node *node = new Node(tqparentNode);
Node *node = new Node(parentNode);
nodeNum++;
node->tag = tag;
node->insideSpecial = true;
if (currentNode && currentNode != tqparentNode)
if (currentNode && currentNode != parentNode)
{
currentNode->next = node;
node->prev = currentNode;
} else
{
if (tqparentNode)
tqparentNode->child = node;
if (parentNode)
parentNode->child = node;
}
if (!rootNode)
rootNode = node;
@ -315,21 +315,21 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
}
qTag = 0L;
goUp = ( tqparentNode &&
( (tag->type == Tag::XmlTagEnd && QuantaCommon::closesTag(tqparentNode->tag, tag)
goUp = ( parentNode &&
( (tag->type == Tag::XmlTagEnd && QuantaCommon::closesTag(parentNode->tag, tag)
) ||
tqparentNode->tag->single )
parentNode->tag->single )
);
if (tqparentNode && !goUp)
if (parentNode && !goUp)
{
qTag = QuantaCommon::tagFromDTD(m_dtd, tqparentNode->tag->name);
qTag = QuantaCommon::tagFromDTD(m_dtd, parentNode->tag->name);
if ( qTag )
{
TQString searchFor = (m_dtd->caseSensitive)?tag->name:tag->name.upper();
searchFor.remove('/');
if ( qTag->stoppingTags.tqcontains(searchFor))
{
tqparentNode->tag->closingMissing = true; //tqparent is single...
parentNode->tag->closingMissing = true; //tqparent is single...
goUp = true;
}
}
@ -340,9 +340,9 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
if (nodeFound)
{
//first create a text/empty node between the current position and the last node
Node *savedParentNode = tqparentNode;
currentNode = ParserCommon::createTextNode(write, currentNode, tagStartLine, tagStartPos, tqparentNode);
if (savedParentNode != tqparentNode)
Node *savedParentNode = parentNode;
currentNode = ParserCommon::createTextNode(write, currentNode, tagStartLine, tagStartPos, parentNode);
if (savedParentNode != parentNode)
goUp = false;
if (!rootNode)
rootNode = currentNode;
@ -351,19 +351,19 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
if (goUp)
{
//handle cases like <ul><li></ul>
if (tag->type == Tag::XmlTagEnd && !QuantaCommon::closesTag(tqparentNode->tag, tag))
if (tag->type == Tag::XmlTagEnd && !QuantaCommon::closesTag(parentNode->tag, tag))
{
while ( tqparentNode->tqparent &&
QuantaCommon::closesTag(tqparentNode->tqparent->tag, tag)
while ( parentNode->tqparent &&
QuantaCommon::closesTag(parentNode->tqparent->tag, tag)
)
{
tqparentNode = tqparentNode->tqparent;
parentNode = parentNode->tqparent;
}
} else
if (qTag && tag->type != Tag::XmlTagEnd)
{
//handle the case when a tag is a stopping tag for tqparent, and grandtqparent and so on.
Node *n = tqparentNode;
Node *n = parentNode;
TQString searchFor = (m_dtd->caseSensitive)?tag->name:tag->name.upper();
while (qTag && n)
{
@ -374,7 +374,7 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
{
n->tag->closingMissing = true; //tqparent is single...
if (n->tqparent)
tqparentNode = n;
parentNode = n;
n = n->tqparent;
} else
{
@ -384,29 +384,29 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
}
}
node = new Node(tqparentNode->tqparent);
node = new Node(parentNode->tqparent);
nodeNum++;
node->prev = tqparentNode;
tqparentNode->next = node;
tqparentNode = tqparentNode->tqparent;
node->prev = parentNode;
parentNode->next = node;
parentNode = parentNode->tqparent;
node->closesPrevious = true;
} else
{
node = new Node(tqparentNode);
node = new Node(parentNode);
nodeNum++;
if (currentNode && currentNode != tqparentNode)
if (currentNode && currentNode != parentNode)
{
currentNode->next = node;
node->prev = currentNode;
} else
{
if (tqparentNode)
if (parentNode)
{
if (!tqparentNode->child)
tqparentNode->child = node;
if (!parentNode->child)
parentNode->child = node;
else
{
Node *n = tqparentNode->child;
Node *n = parentNode->child;
while (n->next)
n = n->next;
n->next = node;
@ -416,7 +416,7 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
}
}
if (!tag->single)
tqparentNode = node;
parentNode = node;
node->tag = tag;
if (tag->type == Tag::NeedsParsing)
@ -467,7 +467,7 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
#endif
cleanGroups();
m_saParser->setParsingEnabled(true);
currentNode = m_saParser->parseArea(area, "", "", tqparentNode, true, true); //TODO: don't parse in detail here
currentNode = m_saParser->parseArea(area, "", "", parentNode, true, true); //TODO: don't parse in detail here
m_saParser->setParsingEnabled(false);
el = m_saParser->lastParsedLine();
ec = m_saParser->lastParsedColumn();
@ -484,16 +484,16 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
el = endLine;
ec = endCol + 1;
}
currentNode = ParserCommon::createTextNode(write, currentNode, el, ec, tqparentNode);
currentNode = ParserCommon::createTextNode(write, currentNode, el, ec, parentNode);
} else
if (el != endLine || ec != endCol)
{
if (currentNode && currentNode->tag->type == Tag::ScriptTag)
{
tqparentNode = currentNode;
parentNode = currentNode;
currentNode = 0L;
}
currentNode = ParserCommon::createTextNode(write, currentNode, endLine, endCol, tqparentNode);
currentNode = ParserCommon::createTextNode(write, currentNode, endLine, endCol, parentNode);
}
if (!rootNode)
rootNode = currentNode;
@ -623,9 +623,9 @@ Node *Parser::nodeAt(int line, int col, bool findDeepest, bool exact)
{
if (node->tqparent)
{
int tqparentEl, tqparentEc;
node->tqparent->tag->endPos(tqparentEl, tqparentEc);
if (!exact && QuantaCommon::isBetween(line, col, bl, bc, tqparentEl, tqparentEc) == 0)
int parentEl, parentEc;
node->tqparent->tag->endPos(parentEl, parentEc);
if (!exact && QuantaCommon::isBetween(line, col, bl, bc, parentEl, parentEc) == 0)
{
node = node->tqparent;
}
@ -1563,14 +1563,14 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd)
node->fileName = fileName;
GroupElement *groupElement = new GroupElement;
groupElement->node = node;
groupElement->tqparentNode = 0L;
groupElement->parentNode = 0L;
int minPos = areaPos + pos + 1;
for (TQValueList<GroupElementPosition>::Iterator gPosIt = gPositions.begin(); gPosIt != gPositions.end(); ++gPosIt)
{
GroupElementPosition gPos = (*gPosIt);
if ( (areaPos + pos > gPos.startPos) && (areaPos + pos < gPos.endPos) && (gPos.startPos < minPos))
{
groupElement->tqparentNode = gPos.element->node;
groupElement->parentNode = gPos.element->node;
minPos = gPos.startPos;
}
}
@ -1588,8 +1588,8 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd)
TQTag *qTag = new TQTag();
qTag->setName(s.left(s.tqfind('(')));
qTag->className = "";
if (groupElement->tqparentNode)
qTag->className = groupElement->tqparentNode->tag->name;
if (groupElement->parentNode)
qTag->className = groupElement->parentNode->tag->name;
write->userTagList.tqreplace(s.lower(), qTag);
}
}
@ -1658,7 +1658,7 @@ void Parser::parseForXMLGroup(Node *node)
groupElement->deleted = false;
groupElement->tag = newTag;
groupElement->node = node;
groupElement->tqparentNode = 0L;
groupElement->parentNode = 0L;
groupElement->global = true;
groupElement->group = const_cast<XMLStructGroup*>(&(xmlGroupIt.data()));
node->m_groupElements.append(groupElement);

42
quanta/parsers/parsercommon.cpp
Unescape View File

@ -78,7 +78,7 @@ void appendAreaToTextNode(Document *write, const AreaStruct &area, Node *node)
node->tag->setTagPosition(bLine, bCol, area.eLine, area.eCol);
}
Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *tqparentNode)
Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *parentNode)
{
Tag *textTag = 0L;
Node *textNode = 0L;
@ -89,10 +89,10 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *tqp
{
node->tag->endPos(bLine, bCol);
} else
if (tqparentNode)
tqparentNode->tag->endPos(bLine, bCol);
if (tqparentNode)
dtd = tqparentNode->tag->dtd();
if (parentNode)
parentNode->tag->endPos(bLine, bCol);
if (parentNode)
dtd = parentNode->tag->dtd();
eCol--;
if (bLine == 0 && bCol == 0)
bCol = -1;
@ -110,13 +110,13 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *tqp
textTag->type = Tag::Text;
}
if (tqparentNode && tqparentNode->tag->single)
if (parentNode && parentNode->tag->single)
{
textNode = new Node(tqparentNode->tqparent);
textNode = new Node(parentNode->tqparent);
nodeNum++;
textNode->prev = tqparentNode;
tqparentNode->next = textNode;
tqparentNode = tqparentNode->tqparent;
textNode->prev = parentNode;
parentNode->next = textNode;
parentNode = parentNode->tqparent;
} else
{
if ( node &&
@ -129,21 +129,21 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *tqp
textTag = 0L;
} else
{
textNode = new Node(tqparentNode);
textNode = new Node(parentNode);
nodeNum++;
if (node && node != tqparentNode)
if (node && node != parentNode)
{
node->next = textNode;
textNode->prev = node;
} else
{
if (tqparentNode)
if (parentNode)
{
Node *n = tqparentNode->child;
Node *n = parentNode->child;
while (n && n->next)
n = n->next;
if (!n)
tqparentNode->child = textNode;
parentNode->child = textNode;
else
{
n->next = textNode;
@ -163,7 +163,7 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *tqp
}
Node* createScriptTagNode(Document *write, const AreaStruct &area, const TQString &areaName,
const DTDStruct *dtd, Node *tqparentNode, Node *currentNode)
const DTDStruct *dtd, Node *parentNode, Node *currentNode)
{
Tag *tag = new Tag();
tag->setTagPosition(area);
@ -178,17 +178,17 @@ Node* createScriptTagNode(Document *write, const AreaStruct &area, const TQStrin
tag->type = Tag::ScriptTag;
tag->validXMLTag = false;
Node *node = new Node(tqparentNode);
Node *node = new Node(parentNode);
nodeNum++;
node->tag = tag;
node->insideSpecial = true;
if (tqparentNode)
if (parentNode)
{
if (!tqparentNode->child)
tqparentNode->child = node;
if (!parentNode->child)
parentNode->child = node;
else
{
Node *n = tqparentNode->child;
Node *n = parentNode->child;
while (n->next)
n = n->next;
n->next = node;

6
quanta/parsers/parsercommon.h
Unescape View File

@ -39,16 +39,16 @@ namespace ParserCommon{
/** Appends a text area to a text node. */
void appendAreaToTextNode(Document *write, const AreaStruct &area, Node *node);
/** Creates a text/empty node between node and the provided position */
Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *tqparentNode);
Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *parentNode);
/** Creates a head node for special areas.
area: the area belonging to this node
areaName: the special area name (type)
dtd: the tqparent DTD
tqparentNode: the tqparent of the node
parentNode: the tqparent of the node
currentNode: the last child of the tqparent, if it exists
*/
Node* createScriptTagNode(Document *write, const AreaStruct &area, const TQString &areaName,
const DTDStruct *dtd, Node *tqparentNode, Node *currentNode);
const DTDStruct *dtd, Node *parentNode, Node *currentNode);
/** Print the doc structure tree to the standard output.
Only for debugging purposes. */

16
quanta/parsers/qtag.cpp
Unescape View File

@ -24,7 +24,7 @@ TQTag::TQTag()
single = false;
optional = false;
type = "xmltag";
tqparentDTD = 0L;
parentDTD = 0L;
}
TQTag::TQTag( TQTag &t)
@ -33,7 +33,7 @@ TQTag::TQTag( TQTag &t)
single = t.single;
optional = t.optional;
m_fileName = t.m_fileName;
tqparentDTD = t.tqparentDTD;
parentDTD = t.parentDTD;
type = t.type;
returnType = t.returnType;
comment = t.comment;
@ -105,7 +105,7 @@ bool TQTag::isAttribute(const TQString &attrName)
//Check in the common attributes
for(i = 0; i < (signed)commonGroups.count(); i++)
{
groupAttrs = tqparentDTD->commonAttrs->tqfind(commonGroups[i]);
groupAttrs = parentDTD->commonAttrs->tqfind(commonGroups[i]);
if(groupAttrs)
{
for(a = groupAttrs->first(); a; a = groupAttrs->next())
@ -136,7 +136,7 @@ void TQTag::setName(const TQString& theName)
/** No descriptions */
TQString TQTag::name(bool doNotConvert)
{
if (doNotConvert || !tqparentDTD || tqparentDTD->caseSensitive)
if (doNotConvert || !parentDTD || parentDTD->caseSensitive)
return tagName;
else
return tagName.upper();
@ -169,7 +169,7 @@ TQTag TQTag::operator = (TQTag &t)
single = t.single;
optional = t.optional;
m_fileName = t.m_fileName;
tqparentDTD = t.tqparentDTD;
parentDTD = t.parentDTD;
type = t.type;
returnType = t.returnType;
comment = t.comment;
@ -204,7 +204,7 @@ Attribute* TQTag::attribute(const TQString& name)
bool TQTag::isChild(const TQString& tag, bool trueIfNoChildsDefined)
{
TQString tagName = tag;
tagName = tqparentDTD->caseSensitive ? tagName : tagName.upper();
tagName = parentDTD->caseSensitive ? tagName : tagName.upper();
if(trueIfNoChildsDefined)
return (childTags.isEmpty() || childTags.tqcontains(tagName));
else
@ -247,10 +247,10 @@ bool TQTag::isChild(Node *node, bool trueIfNoChildsDefined, bool treatEmptyNodes
return isChild(node->tag->name, trueIfNoChildsDefined);
}
TQPtrList<TQTag> TQTag::tqparents()
TQPtrList<TQTag> TQTag::parents()
{
TQPtrList<TQTag> qTagList;
TQDictIterator<TQTag> it((*tqparentDTD->tagsList));
TQDictIterator<TQTag> it((*parentDTD->tagsList));
for(; it.current(); ++it)
{
if(it.current()->isChild(name()))

6
quanta/parsers/qtag.h
Unescape View File

@ -58,7 +58,7 @@ class XMLStructGroup {
bool hasFileName; ///<the group contains filename(s)
TQRegExp fileNameRx; ///<delete the matches of this regexp to obtain a filename (eg. linked, included file name)
bool appendToTags; ///<true if the group elements must be used as normal tags in autocompletion
TQString tqparentGroup; ///<if the group element can be a child of another group (eg. member function of a class), holds the tqparent name. Makes sense only if appentToTags is true
TQString parentGroup; ///<if the group element can be a child of another group (eg. member function of a class), holds the tqparent name. Makes sense only if appentToTags is true
};
@ -248,7 +248,7 @@ public:
//prefer using this variant, it handle Text, Empty, XmlTagEnd nodes!
bool isChild(Node *node, bool trueIfNoChildsDefined = true, bool treatEmptyNodesAsText = false);
/*** Returns the list of tqparent of this tag. */
TQPtrList<TQTag> tqparents();
TQPtrList<TQTag> parents();
/** No descriptions */
TQString fileName();
@ -258,7 +258,7 @@ public:
Attribute* attribute(const TQString& name);
/** The tag belongs to this DTD */
const DTDStruct *tqparentDTD;
const DTDStruct *parentDTD;
/** The tag has the attributes of the above common groups */
TQStringList commonGroups;
TQStringList stoppingTags;

14
quanta/parsers/sagroupparser.cpp
Unescape View File

@ -182,10 +182,10 @@ void SAGroupParser::parseForScriptGroup(Node *node)
}
if (tmpNode && tmpNode->tag->type == Tag::ScriptStructureBegin)
{
groupElement->tqparentNode = tmpNode;
groupElement->parentNode = tmpNode;
} else
{
groupElement->tqparentNode = 0L;
groupElement->parentNode = 0L;
}
groupElement->global = true;
tmpNode = node->tqparent;
@ -194,7 +194,7 @@ void SAGroupParser::parseForScriptGroup(Node *node)
if ( tmpNode->tag->type == Tag::ScriptStructureBegin && tmpNode->tag->dtd()->localScopeKeywordsRx.search(tmpNode->tag->cleanStr) != -1)
{
groupElement->global = false;
groupElement->tqparentNode = tmpNode;
groupElement->parentNode = tmpNode;
break;
}
tmpNode = tmpNode->tqparent;
@ -207,11 +207,11 @@ void SAGroupParser::parseForScriptGroup(Node *node)
int nameEnd = s.tqfind('(');
qTag->setName(s.left(nameEnd));
qTag->className = "";
if (groupElement->tqparentNode)
if (groupElement->parentNode)
{
for (GroupElementList::ConstIterator it2 = groupElement->tqparentNode->m_groupElements.constBegin(); it2 != groupElement->tqparentNode->m_groupElements.constEnd(); ++it2)
for (GroupElementList::ConstIterator it2 = groupElement->parentNode->m_groupElements.constBegin(); it2 != groupElement->parentNode->m_groupElements.constEnd(); ++it2)
{
if ((*it2)->group->name == group.tqparentGroup)
if ((*it2)->group->name == group.parentGroup)
{
qTag->className = (*it2)->tag->name;
break;
@ -253,7 +253,7 @@ void SAGroupParser::parseForScriptGroup(Node *node)
else
break;
}
// Now we are left with the current line, lets check if the variable is inside tqparentheses
// Now we are left with the current line, lets check if the variable is inside parentheses
int lineOpenParenth=tagWholeLineStr.tqfind('(');
if(lineOpenParenth != -1)
{

50
quanta/parsers/saparser.cpp
Unescape View File

@ -157,7 +157,7 @@ bool SAParser::slotParseOneLine()
s_currentNode->tag->type == Tag::Empty) )
ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode);
else
s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, s_currentContext.area.eCol + 1, s_currentContext.tqparentNode);
s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, s_currentContext.area.eCol + 1, s_currentContext.parentNode);
s_currentNode->tag->type = Tag::ScriptStructureBegin;
s_currentNode->tag->single = false;
@ -166,7 +166,7 @@ bool SAParser::slotParseOneLine()
s_currentContext.lastNode = s_currentNode;
s_contextStack.push(s_currentContext);
s_currentContext.tqparentNode = s_currentNode;
s_currentContext.parentNode = s_currentNode;
s_col = s_context.area.bCol + s_context.startString.length();
s_currentContext.area.bLine = s_line;
s_currentContext.area.bCol = s_col;
@ -208,14 +208,14 @@ bool SAParser::slotParseOneLine()
s_currentNode->tag->type == Tag::Empty) )
ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode);
else
s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, groupKeywordPos, s_currentContext.tqparentNode);
s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, groupKeywordPos, s_currentContext.parentNode);
if (s_currentNode)
{
s_currentNode->insideSpecial = true;
s_currentNode->specialInsideXml = m_specialInsideXml;
}
s_previousContext = s_contextStack.pop();
s_currentContext.tqparentNode = s_previousContext.tqparentNode;
s_currentContext.parentNode = s_previousContext.parentNode;
s_currentContext.lastNode = s_previousContext.lastNode;
s_currentContext.type = s_previousContext.type;
s_currentContext.area.bLine = s_line;
@ -232,14 +232,14 @@ bool SAParser::slotParseOneLine()
tag->setDtd(s_dtd);
tag->type = Tag::ScriptStructureEnd;
tag->single = true;
Node *node = new Node(s_currentContext.tqparentNode);
Node *node = new Node(s_currentContext.parentNode);
nodeNum++;
node->tag = tag;
node->insideSpecial = true;
node->specialInsideXml = m_specialInsideXml;
if (s_currentContext.tqparentNode && !s_currentContext.tqparentNode->child)
if (s_currentContext.parentNode && !s_currentContext.parentNode->child)
{
s_currentContext.tqparentNode->child = node;
s_currentContext.parentNode->child = node;
}
else if (s_currentContext.lastNode)
{
@ -275,7 +275,7 @@ bool SAParser::slotParseOneLine()
s_currentNode->tag->type == Tag::Empty) )
ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode);
else
s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, specialAreaPos, s_currentContext.tqparentNode);
s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, specialAreaPos, s_currentContext.parentNode);
if (s_currentNode)
{
s_currentNode->insideSpecial = true;
@ -284,7 +284,7 @@ bool SAParser::slotParseOneLine()
}
//create a toplevel node for the included special area
AreaStruct area(s_line, specialAreaPos, s_line, specialAreaPos + foundText.length() - 1);
Node *node = ParserCommon::createScriptTagNode(m_write, area, foundText, s_dtd, s_currentContext.tqparentNode, s_currentNode);
Node *node = ParserCommon::createScriptTagNode(m_write, area, foundText, s_dtd, s_currentContext.parentNode, s_currentNode);
#ifdef DEBUG_PARSER
kdDebug(24001) << "Parsing a nested area." << endl;
#endif
@ -419,10 +419,10 @@ bool SAParser::slotParseOneLine()
{
s_context.area.bLine = s_line;
s_context.area.eLine = s_context.area.eCol = -1;
s_context.tqparentNode = s_currentContext.tqparentNode;
s_context.parentNode = s_currentContext.parentNode;
s_currentContext.area.eLine = s_context.area.bLine;
s_currentContext.area.eCol = s_context.area.bCol - 1;
// s_currentContext.tqparentNode = s_parentNode;
// s_currentContext.parentNode = s_parentNode;
s_contextStack.push(s_currentContext);
if (s_fullParse)
{
@ -451,14 +451,14 @@ bool SAParser::slotParseOneLine()
}
tag->single = true;
//create a node with the above tag
Node *node = new Node(s_currentContext.tqparentNode);
Node *node = new Node(s_currentContext.parentNode);
nodeNum++;
node->tag = tag;
node->insideSpecial = true;
node->specialInsideXml = m_specialInsideXml;
if (s_currentContext.tqparentNode && !s_currentContext.tqparentNode->child)
if (s_currentContext.parentNode && !s_currentContext.parentNode->child)
{
s_currentContext.tqparentNode->child = node;
s_currentContext.parentNode->child = node;
}
else if (s_currentNode)
{
@ -522,12 +522,12 @@ bool SAParser::slotParseOneLine()
s_currentNode->tag->type == Tag::Empty) )
ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode);
else
s_currentNode = ParserCommon::createTextNode(m_write, 0L, s_line, pos, s_currentContext.tqparentNode);
s_currentNode = ParserCommon::createTextNode(m_write, 0L, s_line, pos, s_currentContext.parentNode);
s_currentNode->insideSpecial = true;
s_currentNode->specialInsideXml = m_specialInsideXml;
}
s_previousContext = s_contextStack.pop();
s_currentContext.tqparentNode = s_previousContext.tqparentNode;
s_currentContext.parentNode = s_previousContext.parentNode;
s_currentContext.type = s_previousContext.type;
s_currentContext.area.bLine = s_line;
s_currentContext.area.bCol = pos + 1;
@ -570,7 +570,7 @@ bool SAParser::slotParseOneLine()
tag->type = Tag::Comment;
tag->single = true;
//create a node with the above tag
Node *node = new Node(s_currentContext.tqparentNode);
Node *node = new Node(s_currentContext.parentNode);
nodeNum++;
node->tag = tag;
node->insideSpecial = true;
@ -585,7 +585,7 @@ bool SAParser::slotParseOneLine()
s_currentNode = node;
}
s_previousContext = s_contextStack.pop();
s_currentContext.tqparentNode = s_previousContext.tqparentNode;
s_currentContext.parentNode = s_previousContext.parentNode;
s_currentContext.type = s_previousContext.type;
s_currentContext.area.bLine = s_line;
s_currentContext.area.bCol = s_currentContext.area.eCol + 1;
@ -635,11 +635,11 @@ bool SAParser::slotParseOneLine()
Node* SAParser::parseArea(const AreaStruct &specialArea,
const TQString &areaStartString,
const TQString &forcedAreaEndString,
Node *tqparentNode,
Node *parentNode,
bool fullParse, bool synchronous)
{
m_synchronous = synchronous;
s_parentNode = tqparentNode;
s_parentNode = parentNode;
s_fullParse = fullParse;
#ifdef DEBUG_PARSER
kdDebug(24001) << "parseArea full: " << s_fullParse << " synch: " << m_synchronous <<endl;
@ -656,11 +656,11 @@ Node* SAParser::parseArea(const AreaStruct &specialArea,
s_dtd = 0L;
if (s_parentNode && !areaStartString.isEmpty())
{
const DTDStruct *tqparentDTD = m_dtd;
const DTDStruct *parentDTD = m_dtd;
if (s_parentNode->tqparent)
tqparentDTD = s_parentNode->tqparent->tag->dtd();
s_dtd = DTDs::ref()->tqfind(tqparentDTD->specialAreaNames[areaStartString]);
s_areaEndString = tqparentDTD->specialAreas[areaStartString];
parentDTD = s_parentNode->tqparent->tag->dtd();
s_dtd = DTDs::ref()->tqfind(parentDTD->specialAreaNames[areaStartString]);
s_areaEndString = parentDTD->specialAreas[areaStartString];
s_searchForAreaEnd = true;
}
if (!forcedAreaEndString.isEmpty())
@ -702,7 +702,7 @@ Node* SAParser::parseArea(const AreaStruct &specialArea,
s_currentContext.area.bLine = s_line;
s_currentContext.area.bCol = s_col;
s_currentContext.area.eLine = s_currentContext.area.eCol = -1;
s_currentContext.tqparentNode = s_parentNode;
s_currentContext.parentNode = s_parentNode;
s_currentNode = s_parentNode;
m_lastParsedNode = 0L;
s_useReturnVars = false;

6
quanta/parsers/saparser.h
Unescape View File

@ -57,7 +57,7 @@ public:
area. It may end before the end position.
areaStartString: the special area starting string
forcedAreaEndString: force this as the special area ending string.
tqparentNode: the Node under where the special area goes
parentNode: the Node under where the special area goes
fullParse: the script node will be fully parsed for groups, structures or so. If false, only the script beginning and end will be determined.
synchronous: if true, the function does not return until the parsing is finished, otherwise
return immediately.
@ -66,7 +66,7 @@ public:
Node* parseArea(const AreaStruct &specialArea,
const TQString &areaStartString,
const TQString &forcedAreaEndString,
Node *tqparentNode,
Node *parentNode,
bool fullParse, bool synchronous);
/** Returns the line where the last parsing run ended. */
int lastParsedLine() {return m_lastParsedLine;}
@ -97,7 +97,7 @@ private:
int type;
AreaStruct area;
TQString startString;
Node *tqparentNode;
Node *parentNode;
Node *lastNode;
};
enum ContextType {

6
quanta/parsers/tag.cpp
Unescape View File

@ -328,7 +328,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write)
{
newTag = new TQTag();
newTag->setName(name);
newTag->tqparentDTD = m_dtd;
newTag->parentDTD = m_dtd;
}
for (int i = 0; i >attrCount(); i++)
{
@ -574,7 +574,7 @@ void Tag::modifyAttributes(TQDict<TQString> *attrDict)
{
attribute = it.currentKey();
value = *(it.current());
if (qTag && qTag->tqparentDTD->singleTagStyle == "xml" && attribute=="/")
if (qTag && qTag->parentDTD->singleTagStyle == "xml" && attribute=="/")
{
++it;
continue;
@ -622,7 +622,7 @@ TQString Tag::toString()
attrString.append(QuantaCommon::tagCase(name));
tagString.prepend(attrString);
if (attrs.isEmpty() && qTag && qTag->tqparentDTD->singleTagStyle == "xml" &&
if (attrs.isEmpty() && qTag && qTag->parentDTD->singleTagStyle == "xml" &&
(qTag->isSingle() ||
(!qConfig.closeOptionalTags && qTag->isOptional()) || single)
)

2
quanta/parts/kafka/htmldocumentpropertiesui.ui
Unescape View File

@ -452,5 +452,5 @@
<slot access="protected" specifier="pure virtual">CSSChanged(TQListViewItem * )</slot>
<slot access="protected" specifier="pure virtual">linkChanged( const TQString&amp; )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

8
quanta/parts/kafka/htmlenhancer.cpp
Unescape View File

@ -47,7 +47,7 @@ HTMLEnhancer::~HTMLEnhancer()
delete m_stddirs;
}
bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node nextDNode)
bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node nextDNode)
{
DOM::Node domNode, domNode2, attr, *ptDomNode;
bool tbody, goUp;
@ -127,7 +127,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node ne
}
TQTag* qTag = QuantaCommon::tagFromDTD(m_wkafkapart->getCurrentDoc()->defaultDTD(),
tqparentDNode.nodeName().string());
parentDNode.nodeName().string());
//THEN tqreplace, if asked, scripts by a little icon.
if(node->tag->type == Tag::ScriptTag && m_showIconForScripts && qTag->isChild("IMG", false))
@ -160,7 +160,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node ne
kafkaCommon::editDomNodeAttribute(domNode, "img", m_wkafkapart->defaultDTD(),
"title", text, m_wkafkapart->getKafkaWidget()->document());
if(!kafkaCommon::insertDomNode(domNode, tqparentDNode, nextDNode))
if(!kafkaCommon::insertDomNode(domNode, parentDNode, nextDNode))
return false;
m_wkafkapart->connectDomNodeToQuantaNode(domNode, node);
}
@ -196,7 +196,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node ne
kafkaCommon::editDomNodeAttribute(domNode, "img", m_wkafkapart->defaultDTD(),
"title", text, m_wkafkapart->getKafkaWidget()->document());
if(!kafkaCommon::insertDomNode(domNode, tqparentDNode, nextDNode))
if(!kafkaCommon::insertDomNode(domNode, parentDNode, nextDNode))
return false;
m_wkafkapart->connectDomNodeToQuantaNode(domNode, node);
}

4
quanta/parts/kafka/htmlenhancer.h
Unescape View File

@ -47,10 +47,10 @@ public:
* The DOM::Node must be built before calling this
* function.
* @param node The Node we want to enhance.
* @param tqparentDNode the tqparent DOM::Node of the root DOM::Node of node.
* @param parentDNode the tqparent DOM::Node of the root DOM::Node of node.
* @param nextDNode the DOM::Node next to the root DOM::Node of node.
*/
virtual bool enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node nextDNode);
virtual bool enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node nextDNode);
/**
* This functions is called once the whole DOM::Node tree is built. It will add empty

62
quanta/parts/kafka/kafkacommon.cpp
Unescape View File

@ -386,9 +386,9 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod
!node->prev && getNodeDisplay(node->tqparent, true) == kafkaCommon::blockDisplay)
{
AreaStruct node_area = node->tag->area();
AreaStruct tqparent_area = node->tqparent->tag->area();
AreaStruct parent_area = node->tqparent->tag->area();
if(node_area.bLine == tqparent_area.bLine)
if(node_area.bLine == parent_area.bLine)
{
node->tag->setIndentationDone(true);
return;
@ -969,7 +969,7 @@ Node* kafkaCommon::createMandatoryNodeSubtree(Node *node, Document *doc)
{
if(it.data())
{
nodeTQTag = QuantaCommon::tagFromDTD(nodeTQTag->tqparentDTD, it.key());
nodeTQTag = QuantaCommon::tagFromDTD(nodeTQTag->parentDTD, it.key());
if(!nodeTQTag)
return node;
currentParent = createAndInsertNode(nodeTQTag->name(), "", Tag::XmlTag, doc,
@ -1404,10 +1404,10 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti
//node is not the first Child of parentNode, we have to duplicate parentNode, and put node and
//all its next sibling as child of the new parentNode.
/**newParentNode = insertNode(parentNode->tag->name, parentNode->tag->tagStr(),
parentNode->tag->type, parentNode->tag->write(), parentNode->tqparentNode(),
parentNode->tag->type, parentNode->tag->write(), parentNode->parentNode(),
parentNode, parentNode, modifs);*/
newParentNode = duplicateNode(parentNode);
insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
child = parentNode->firstChild();
if(cursorOffset != 0)
{
@ -1447,10 +1447,10 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti
//node is not the first Child of parentNode, we have to duplicate parentNode, and put node and
//all its next sibling as child of the new parentNode.
/**newParentNode = insertNode(parentNode->tag->name, parentNode->tag->tagStr(),
parentNode->tag->type, parentNode->tag->write(), parentNode->tqparentNode(),
parentNode->tag->type, parentNode->tag->write(), parentNode->parentNode(),
parentNode, parentNode, modifs);*/
newParentNode = duplicateNode(parentNode);
insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
child = parentNode->firstChild();
while(child /*&& child == endNode*/ &&
(child == endNode || child->hasForChild(endNode)/* ||
@ -1670,10 +1670,10 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
//node is not the first Child of parentNode, we have to duplicate parentNode, and put node and
//all its next sibling as child of the new parentNode.
/**newParentNode = insertNode(parentNode->tag->name, parentNode->tag->tagStr(),
parentNode->tag->type, parentNode->tag->write(), parentNode->tqparentNode(),
parentNode->tag->type, parentNode->tag->write(), parentNode->parentNode(),
parentNode, parentNode, modifs);*/
newParentNode = duplicateNode(parentNode);
insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
child = parentNode->firstChild();
while(child && child != startNode && !child->hasForChild(startNode))
{
@ -1694,10 +1694,10 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
//node is not the last Child of parentNode, we have to duplicate parentNode, and put all
//the next sibling of node as child of the new parentNode
/**newParentNode = insertNode(parentNode->tag->name, parentNode->tag->tagStr(),
parentNode->tag->type, parentNode->tag->write(), parentNode->tqparentNode(),
parentNode->tag->type, parentNode->tag->write(), parentNode->parentNode(),
parentNode, parentNode, modifs);*/
newParentNode = duplicateNode(parentNode);
insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
if(parentNode == commonParentStartChild)
commonParentStartChild = newParentNode;
if(parentNode == commonParentEndChild)
@ -1986,10 +1986,10 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode,
if (startSelection && endSelection)
{
/**copyNewNode = duplicateNode(newNode);
insertNode(copyNewNode, startSelection->tqparentNode(), startSelection,
insertNode(copyNewNode, startSelection->parentNode(), startSelection,
endSelection->next, modifs);*/
copyNewNode = duplicateNodeSubtree(newNode);
insertNodeSubtree(copyNewNode, startSelection->tqparentNode(), startSelection,
insertNodeSubtree(copyNewNode, startSelection->parentNode(), startSelection,
endSelection->next, modifs);
nodeInserted = true;
}
@ -2067,10 +2067,10 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode,
if (startSelection && endSelection)
{
/**copyNewNode = duplicateNode(newNode);
insertNode(copyNewNode, startSelection->tqparentNode(), startSelection,
insertNode(copyNewNode, startSelection->parentNode(), startSelection,
endSelection->next, modifs);*/
copyNewNode = duplicateNodeSubtree(newNode);
insertNodeSubtree(copyNewNode, startSelection->tqparentNode(), startSelection,
insertNodeSubtree(copyNewNode, startSelection->parentNode(), startSelection,
endSelection->next, modifs);
nodeInserted = true;
}
@ -2097,10 +2097,10 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode,
while(endSelection && endSelection->tag->type == Tag::Empty)
endSelection = endSelection->prev;
/**copyNewNode = duplicateNode(newNode);
insertNode(copyNewNode, startSelection->tqparentNode(), startSelection,
insertNode(copyNewNode, startSelection->parentNode(), startSelection,
endSelection->next, modifs);*/
copyNewNode = duplicateNodeSubtree(newNode);
insertNodeSubtree(copyNewNode, startSelection->tqparentNode(), startSelection,
insertNodeSubtree(copyNewNode, startSelection->parentNode(), startSelection,
endSelection->next, modifs);
nodeInserted = true;
}
@ -2643,7 +2643,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
int startOffset, Node *endNode, int endOffset, Node **cursorNode, long &cursorOffset,
NodeModifsSet *modifs)
{
TQTag *nodeNameTQTag, *tqparentTQTag;
TQTag *nodeNameTQTag, *parentTQTag;
Node *node, *lastNodeNameStartNode, *lastNodeNameEndNode;
Node *parentNode, *newParentNode, *child, *next;
bool goUp, nodesRemoved = false, DTDError = false, result;
@ -2672,7 +2672,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
return kafkaCommon::extractionBadParameters;
//Then, process startNode and endNode : look if a nodeName tqparent is one of
//startNode/endNode's inline tqparents and if it is the case, split the necessary Nodes.
//startNode/endNode's inline parents and if it is the case, split the necessary Nodes.
//The comparaison is made in lowercase, even in xml : it could be strange, for an user, to have
//its nodes not removed because there are in the wrong case.
node = startNode;
@ -2730,7 +2730,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
if(node != parentNode->firstChild())
{
newParentNode = duplicateNode(parentNode);
insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
child = parentNode->firstChild();
while(child && child != startNode && !child->hasForChild(startNode))
{
@ -2752,7 +2752,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
if(node != parentNode->SLastChild())
{
newParentNode = duplicateNode(parentNode);
insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
if(parentNode == lastNodeNameStartNode)
lastNodeNameStartNode = newParentNode;
child = parentNode->firstChild();
@ -2782,13 +2782,13 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
next = getNextNode(node, goUp);
if(node->tag->type == Tag::XmlTag && node->tag->name.lower() == nodeName.lower())
{
tqparentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
if(tqparentTQTag)
parentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
if(parentTQTag)
{
child = node->firstChild();
while(child)
{
if(!tqparentTQTag->isChild(child))
if(!parentTQTag->isChild(child))
DTDError = true;
child = child->next;
}
@ -2951,7 +2951,7 @@ void kafkaCommon::splitStartNodeSubtree(Node* startNode, Node* commonParent,
if(node != parentNode->firstChild())
{
Node* newParentNode = duplicateNode(parentNode);
insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
Node* child = parentNode->firstChild();
while(child && child != startNode && !child->hasForChild(startNode))
{
@ -2989,7 +2989,7 @@ void kafkaCommon::splitEndNodeSubtree(Node* endNode, Node* commonParent,
if(node != parentNode->lastChild())
{
Node* newParentNode = duplicateNode(parentNode);
insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
if(parentNode == commonParentStartChild)
commonParentStartChild = newParentNode;
if(parentNode == commonParentEndChild)
@ -3908,24 +3908,24 @@ bool kafkaCommon::isInline(DOM::Node domNode)
return isInline(domNode.nodeName().string());
}
bool kafkaCommon::tqparentSupports(DOM::Node tqparent, DOM::Node startNode, DOM::Node endNode,
bool kafkaCommon::parentSupports(DOM::Node tqparent, DOM::Node startNode, DOM::Node endNode,
const DTDStruct* dtd)
{
TQTag *tqparentTQTag;
TQTag *parentTQTag;
DOM::Node child;
if(!dtd || tqparent.isNull())
return false;
tqparentTQTag = QuantaCommon::tagFromDTD(dtd, tqparent.nodeName().string());
parentTQTag = QuantaCommon::tagFromDTD(dtd, tqparent.nodeName().string());
if(!tqparentTQTag)
if(!parentTQTag)
return false;
child = startNode;
while(!child.isNull())
{
if(!tqparentTQTag->isChild(child.nodeName().string()))
if(!parentTQTag->isChild(child.nodeName().string()))
return false;
if(child == endNode)
return true;

34
quanta/parts/kafka/kafkacommon.h
Unescape View File

@ -290,19 +290,19 @@ public:
* WARNING : baseNode is used as the rootNode.
* It will also try to merge text/Empty Nodes.
* @param node The node to insert.
* @param tqparentNode This Node will be the tqparent of node.
* @param parentNode This Node will be the tqparent of node.
* @param nextSibling This Node will be the next Sibling of Node. If null, node will be appended at
* the child list of tqparentNode.
* the child list of parentNode.
* TODO: @param rootNode The rootNode of the tree we want to insert the Node (usually &baseNode).
* @param modifs The changes made are logged into modifs. Put 0L if you don't want to log
* and if you know what you're doing!
* @param merge Try to merge with the siblings if possible.
* @return Returns a pointer to the node inserted.
*/
static Node* insertNode(Node *node, Node* tqparentNode, Node* nextSibling,
static Node* insertNode(Node *node, Node* parentNode, Node* nextSibling,
NodeModifsSet *modifs/**, Node **rootNode*/, bool merge = true);
static Node* insertNode(Node *node, Node* tqparentNode, Node* nextSibling, NodeSelection& selection,
static Node* insertNode(Node *node, Node* parentNode, Node* nextSibling, NodeSelection& selection,
NodeModifsSet *modifs, bool merge = true);
/**
@ -373,15 +373,15 @@ public:
* WARNING : baseNode is used as the rootNode.
* It will also try to merge text/Empty Nodes.
* @param node The root node of the Node subtree to insert.
* @param tqparentNode This Node will be the tqparent of node.
* @param parentNode This Node will be the tqparent of node.
* @param nextSibling This Node will be the next Sibling of Node. If null, node will be appended at
* the child list of tqparentNode.
* the child list of parentNode.
* @param modifs The changes made are logged into modifs. Put 0L if you don't want to log
* and if you know what you're doing!
* @param merge Try to merge with the siblings if possible.
* @return Returns a pointer to the node inserted.
*/
static Node* insertNodeSubtree(Node *node, Node* tqparentNode, Node* nextSibling,
static Node* insertNodeSubtree(Node *node, Node* parentNode, Node* nextSibling,
NodeModifsSet *modifs, bool merge = true);
/**
@ -401,7 +401,7 @@ public:
* @param modifs The changes made are logged into modifs.
* @return Returns a pointer to the node inserted.
*/
static Node* insertNodeSubtree(Node *node, Node* tqparentNode, Node* nextSibling,
static Node* insertNodeSubtree(Node *node, Node* parentNode, Node* nextSibling,
Node* nextEndSibling, NodeModifsSet *modifs, bool merge = true);
/**
@ -414,7 +414,7 @@ public:
static Node* DTDInsertNodeSubtree(Node *node, NodeSelectionInd& selection,
Node **cursorNode, long& cursorOffset, NodeModifsSet *modifs);
static Node* DTDInsertNodeSubtree(Node* newNode, Node* tqparentNode, Node* nextSibling,
static Node* DTDInsertNodeSubtree(Node* newNode, Node* parentNode, Node* nextSibling,
NodeSelection& cursorHolder, NodeModifsSet *modifs);
/**
@ -544,7 +544,7 @@ public:
/**
* Extract a node subtree in the tree. WARNING This function will log that the nodes were added.
* This funtion not only extract the start node but also will extract inline tqparents.
* This funtion not only extract the start node but also will extract inline parents.
* @param startNode The node from which we start the removal.
* @param startOffset The offset of startNode from which we start the removal.
* @param endNode The node from which we end the removal.
@ -576,7 +576,7 @@ public:
* Get a node subtree from the tree. It is similar to extractNodeSubtree()
* but it doesn't extract anything.
* It's useful to get a copy of the Node subtree from a selection, for example.
* This funtion not only extract the start node but also will extract inline tqparents.
* This funtion not only extract the start node but also will extract inline parents.
* @param startNode The starting Node.
* @param startOffset If firstNode is a text, specify at which offset the new start Node will be splitted.
* @param endNode The ending Node.
@ -630,7 +630,7 @@ public:
* @param nodeToMove The node to move :-)
* @param newParent The new tqparent of nodeToMove.
* @param newNextSibling The new next Sibling of nodeToMove. If null, node will be appended at
* the child list of tqparentNode.
* the child list of parentNode.
* @param modifs The changes made are logged into modifs.
* @param merge Specifies if it should try to merge the Node at its new location.
*/
@ -855,7 +855,7 @@ public:
/**
* Get the node's depth in the tree.
* @param node The node we want the depth.
* @return Returns the depth of node. It is basically the number of tqparents of node.
* @return Returns the depth of node. It is basically the number of parents of node.
* It will return 0 if node has no tqparent Nodes, and -1 if node doesn't exists.
*/
static int nodeDepth(Node *node);
@ -991,12 +991,12 @@ public:
static int childPosition(DOM::Node domNode);
/**
* Returns the position'th child of tqparentNode.
* @param tqparentNode The tqparent Node of the node to return.
* Returns the position'th child of parentNode.
* @param parentNode The tqparent Node of the node to return.
* @param position We return the position'th child Node.
* @param fallback If set to true, it will always return a valid Node (except if there is no child!!)
*/
static DOM::Node getChildNode(DOM::Node tqparentNode, int position, bool fallback = false);
static DOM::Node getChildNode(DOM::Node parentNode, int position, bool fallback = false);
/**
* Specify if a DOM::Node is inline (as specified in isInline()) or text.
@ -1008,7 +1008,7 @@ public:
* Specify if tqparent supports the siblings DOM::Nodes starting from startNode to endNode
* according to the DTD dtd.
*/
static bool tqparentSupports(DOM::Node tqparent, DOM::Node startNode, DOM::Node endNode,
static bool parentSupports(DOM::Node tqparent, DOM::Node startNode, DOM::Node endNode,
const DTDStruct* dtd);

24
quanta/parts/kafka/kafkahtmlpart.cpp
Unescape View File

@ -1034,12 +1034,12 @@ void KafkaWidget::keyDelete()
}
else if(isParent && !nextIsBlock)
{
if(kafkaCommon::tqparentSupports(toplevelBlock, startNode2, endNode2,
if(kafkaCommon::parentSupports(toplevelBlock, startNode2, endNode2,
w->getCurrentDoc()->defaultDTD()))
moveDomNodes(toplevelBlock, startNode2, endNode2, DOM::Node(), false);
else
{
if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode,
if(kafkaCommon::parentSupports(commonParent, startNode, endNode,
w->getCurrentDoc()->defaultDTD()))
moveDomNodes(commonParent, startNode, endNode, childOfCommonParent2,
true);
@ -1051,13 +1051,13 @@ void KafkaWidget::keyDelete()
}
else if(isParent && nextIsBlock)
{
if(kafkaCommon::tqparentSupports(toplevelBlock, startNode2, endNode2,
if(kafkaCommon::parentSupports(toplevelBlock, startNode2, endNode2,
w->getCurrentDoc()->defaultDTD()))
moveDomNodes(toplevelBlock, startNode2, endNode2, DOM::Node(), false);
else
{
if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode,
w->getCurrentDoc()->defaultDTD()) && kafkaCommon::tqparentSupports(
if(kafkaCommon::parentSupports(commonParent, startNode, endNode,
w->getCurrentDoc()->defaultDTD()) && kafkaCommon::parentSupports(
commonParent, startNode2, endNode2, w->getCurrentDoc()->defaultDTD()))
{
moveDomNodes(commonParent, startNode, endNode, childOfCommonParent,
@ -1073,7 +1073,7 @@ void KafkaWidget::keyDelete()
}
else if(!isParent && nextIsBlock)
{
if(kafkaCommon::tqparentSupports(commonParent, startNode2, endNode2,
if(kafkaCommon::parentSupports(commonParent, startNode2, endNode2,
w->getCurrentDoc()->defaultDTD()))
moveDomNodes(commonParent, startNode2, endNode2, childOfCommonParent2, true);
else
@ -1460,13 +1460,13 @@ void KafkaWidget::keyBackspace()
}
else if(isParent && !prevIsBlock)
{
if(kafkaCommon::tqparentSupports(toplevelBlock2, startNode, endNode,
if(kafkaCommon::parentSupports(toplevelBlock2, startNode, endNode,
w->getCurrentDoc()->defaultDTD()))
moveDomNodes(toplevelBlock2, startNode, endNode, toplevelBlock2.firstChild(),
true);
else
{
if(kafkaCommon::tqparentSupports(commonParent, startNode2, endNode2,
if(kafkaCommon::parentSupports(commonParent, startNode2, endNode2,
w->getCurrentDoc()->defaultDTD()))
moveDomNodes(commonParent, startNode2, endNode2,
childOfCommonParent2, true);
@ -1478,14 +1478,14 @@ void KafkaWidget::keyBackspace()
}
else if(isParent && prevIsBlock)
{
if(kafkaCommon::tqparentSupports(toplevelBlock2, startNode, endNode,
if(kafkaCommon::parentSupports(toplevelBlock2, startNode, endNode,
w->getCurrentDoc()->defaultDTD()))
moveDomNodes(toplevelBlock2, startNode, endNode, toplevelBlock2.firstChild(),
true);
else
{
if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode,
w->getCurrentDoc()->defaultDTD()) && kafkaCommon::tqparentSupports(
if(kafkaCommon::parentSupports(commonParent, startNode, endNode,
w->getCurrentDoc()->defaultDTD()) && kafkaCommon::parentSupports(
commonParent, startNode2, endNode2, w->getCurrentDoc()->defaultDTD()))
{
moveDomNodes(commonParent, startNode, endNode, childOfCommonParent,
@ -1501,7 +1501,7 @@ void KafkaWidget::keyBackspace()
}
else if(!isParent && prevIsBlock)
{
if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode,
if(kafkaCommon::parentSupports(commonParent, startNode, endNode,
w->getCurrentDoc()->defaultDTD()))
moveDomNodes(commonParent, startNode, endNode, childOfCommonParent, false);
else

2
quanta/parts/kafka/kafkahtmlpart.h
Unescape View File

@ -114,7 +114,7 @@ public:
/**
* It will move DOM::Nodes from startNode to endNode as tqchildren of newParent. It does NOT check
* if the move is valid, so it may crash. Please check before with kafkaCommon::tqparentSupports().
* if the move is valid, so it may crash. Please check before with kafkaCommon::parentSupports().
* @param newParent The new tqparent of the DOM::Nodes.
* @param startNode The first node to move.
* @param endNode Starting from endNode, the last sibling to move.

2
quanta/parts/kafka/kafkasyncoptionsui.ui
Unescape View File

@ -192,5 +192,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

4
quanta/parts/kafka/nodeenhancer.h
Unescape View File

@ -45,10 +45,10 @@ public:
* The DOM::Node must be built before calling this
* function.
* @param node The Node we want to enhance.
* @param tqparentDNode the tqparent DOM::Node of the root DOM::Node of node.
* @param parentDNode the tqparent DOM::Node of the root DOM::Node of node.
* @param nextDNode the DOM::Node next to the root DOM::Node of node.
*/
virtual bool enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node nextDNode) = 0;
virtual bool enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node nextDNode) = 0;
/**
* This function apply some modifications once the whole DOM::Node tree is built.

22
quanta/parts/kafka/undoredo.cpp
Unescape View File

@ -703,10 +703,10 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
{
//try
//{
dn = n->_rootNode.tqparentNode().removeChild(n->_rootNode);
dn = n->_rootNode.parentNode().removeChild(n->_rootNode);
//} catch(DOM::DOMException e) {kafkaSyncError();}
//try{
domNode.tqparentNode().insertBefore(dn, domNode);
domNode.parentNode().insertBefore(dn, domNode);
//} catch(DOM::DOMException e) {}
}
else if(n->tag->type == Tag::XmlTag || n->tag->type == Tag::Text)
@ -733,7 +733,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
}
}
//try{
domNode.tqparentNode().removeChild(domNode);
domNode.parentNode().removeChild(domNode);
//} catch(DOM::DOMException e) {kafkaSyncError();}
}
else if(_node->tag->type == Tag::XmlTagEnd && _node->closesPrevious &&
@ -764,9 +764,9 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
{
kafkaInterface->disconnectDomNodeFromQuantaNode(dm);
//try{
dm.tqparentNode().removeChild(dm);
dm.parentNode().removeChild(dm);
//} catch(DOM::DOMException e) {kafkaSyncError();}
dm = kafkaCommon::getNextDomNode(dm, goUp, false, domNode.tqparentNode());
dm = kafkaCommon::getNextDomNode(dm, goUp, false, domNode.parentNode());
}
}
else
@ -775,7 +775,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
while(!domNode.nextSibling().isNull())
{
//try{
dn = domNode.tqparentNode().removeChild(domNode.nextSibling());
dn = domNode.parentNode().removeChild(domNode.nextSibling());
//} catch(DOM::DOMException e) {kafkaSyncError();}
//try{
domNode2.appendChild(dn);
@ -788,7 +788,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
while(!domNode.nextSibling().isNull())
{
//try{
dn = domNode.tqparentNode().removeChild(domNode.nextSibling());
dn = domNode.parentNode().removeChild(domNode.nextSibling());
//} catch(DOM::DOMException e) {kafkaSyncError();}
//try{
domNode2.appendChild(dn);
@ -810,7 +810,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
return true;//no kafka node here, due to an invalid pos.
domNode = _node->_rootNode;
//try{
domNode.tqparentNode().removeChild(domNode);
domNode.parentNode().removeChild(domNode);
//} catch(DOM::DOMException e) {kafkaSyncError();}
kafkaInterface->disconnectDomNodeFromQuantaNode(domNode);
kafkaInterface->buildKafkaNodeFromNode(_node);
@ -837,7 +837,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
if(!n->_rootNode.isNull())
{
//try{
dn = n->_rootNode.tqparentNode().removeChild(n->_rootNode);
dn = n->_rootNode.parentNode().removeChild(n->_rootNode);
//} catch(DOM::DOMException e) {kafkaSyncError();}
//try{
domNode.appendChild(dn);
@ -857,10 +857,10 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
if(!n->_rootNode.isNull())
{
//try{
dn = n->_rootNode.tqparentNode().removeChild(n->_rootNode);
dn = n->_rootNode.parentNode().removeChild(n->_rootNode);
//} catch(DOM::DOMException e) {kafkaSyncError();}
//try{
domNode.tqparentNode().appendChild(dn);
domNode.parentNode().appendChild(dn);
//} catch(DOM::DOMException e) {}
}
else if(n->tag->type == Tag::XmlTag || n->tag->type == Tag::Text)

18
quanta/parts/kafka/wkafkapart.cpp
Unescape View File

@ -526,9 +526,9 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
else
canInsertEmptyNode = kafkaCommon::hasParent(node, "body");
Node* tqparent_node = node->tqparent;
TQTag* tqparent_node_description_tag = QuantaCommon::tagFromDTD(tqparent_node);
if(tqparent_node_description_tag && !tqparent_node_description_tag->isChild(node, false, true))
Node* parent_node = node->tqparent;
TQTag* parent_node_description_tag = QuantaCommon::tagFromDTD(parent_node);
if(parent_node_description_tag && !parent_node_description_tag->isChild(node, false, true))
canInsertEmptyNode = false;
}
@ -1930,7 +1930,7 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs
Node *node = 0L;
NodeModif *modif;
kNodeAttrs *props, *newProps;
DOM::Node newDomNode, tqparentDomNode, nextSiblingDomNode;
DOM::Node newDomNode, parentDomNode, nextSiblingDomNode;
DOM::Node *ptDomNode;
TQTag *qTag;
@ -1985,7 +1985,7 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs
//let's create the corresponding Text Node and the P tag only if necessary
modifs = new NodeModifsSet();
modif = new NodeModif();
tqparentDomNode = domNode.parentNode();
parentDomNode = domNode.parentNode();
nextSiblingDomNode = domNode.nextSibling();
if(!qTag->isChild("#text", false))
@ -1993,7 +1993,7 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs
newDomNode = kafkaCommon::createDomNode("p",
getNode(domNode.parentNode())->tag->dtd(), m_kafkaPart->document());
kafkaCommon::removeDomNode(domNode);
kafkaCommon::insertDomNode(newDomNode, tqparentDomNode, nextSiblingDomNode);
kafkaCommon::insertDomNode(newDomNode, parentDomNode, nextSiblingDomNode);
kafkaCommon::insertDomNode(domNode, newDomNode);
node = kafkaCommon::createNode("p", "", Tag::XmlTag, m_currentDoc);
@ -2002,12 +2002,12 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs
node->setRootNode(ptDomNode);
ptDomNode = new DOM::Node(newDomNode);
node->setLeafNode(ptDomNode);
node = kafkaCommon::insertNode(node, getNode(tqparentDomNode),
node = kafkaCommon::insertNode(node, getNode(parentDomNode),
getNode(nextSiblingDomNode), getNode(nextSiblingDomNode), modifs);
newProps->setNode(node);
modifs->addNodeModif(modif);
tqparentDomNode = newDomNode;
parentDomNode = newDomNode;
nextSiblingDomNode = DOM::Node();
modif = new NodeModif();
}
@ -2019,7 +2019,7 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs
ptDomNode = new DOM::Node(domNode);
node->setLeafNode(ptDomNode);
//avoid the merging of Text Nodes
node = kafkaCommon::insertNode(node, getNode(tqparentDomNode),
node = kafkaCommon::insertNode(node, getNode(parentDomNode),
getNode(nextSiblingDomNode), modifs, false);
props->setNode(node);
modifs->addNodeModif(modif);

14
quanta/parts/preview/whtmlpart.cpp
Unescape View File

@ -33,11 +33,11 @@
#include "whtmlpart.h"
#include "resource.h"
WHTMLPart::WHTMLPart(TQWidget *tqparentWidget, const char *widgetName, bool enableViewSource,
WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enableViewSource,
TQObject *tqparent, const char *name, GUIProfile prof)
: KHTMLPart(tqparentWidget, widgetName, tqparent, name, prof), m_contextMenu(0)
: KHTMLPart(parentWidget, widgetName, tqparent, name, prof), m_contextMenu(0)
{
//kdDebug(24000) << "WHTMLPart: " << tqparentWidget << " " << widgetName << " " << tqparent << " " << name << this << endl;
//kdDebug(24000) << "WHTMLPart: " << parentWidget << " " << widgetName << " " << tqparent << " " << name << this << endl;
hpos = 0;
// get settings from konq.
KConfig konqConfig("konquerorrc");
@ -52,7 +52,7 @@ WHTMLPart::WHTMLPart(TQWidget *tqparentWidget, const char *widgetName, bool enab
m_enableViewSource = enableViewSource;
if (m_enableViewSource)
{
m_contextMenu = new KPopupMenu(tqparentWidget);
m_contextMenu = new KPopupMenu(parentWidget);
m_contextMenu->insertItem(i18n("View &Document Source"), this, TQT_SLOT(slotViewSource()));
connect(this, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), TQT_SLOT(popupMenu(const TQString&, const TQPoint&)));
@ -149,13 +149,13 @@ bool WHTMLPart::forwardEnable()
return hpos < history.count()-1;
}
KParts::ReadOnlyPart *WHTMLPart::createPart( TQWidget * tqparentWidget, const char *widgetName,
KParts::ReadOnlyPart *WHTMLPart::createPart( TQWidget * parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const TQString &, TQString &,
TQStringList &, const TQStringList &)
{
//kdDebug(24000) << "Create WHTMLPart: " << tqparentWidget << " " << widgetName << " " << tqparent << " " << name << endl;
return new WHTMLPart(tqparentWidget, widgetName, m_enableViewSource, tqparent, name);
//kdDebug(24000) << "Create WHTMLPart: " << parentWidget << " " << widgetName << " " << tqparent << " " << name << endl;
return new WHTMLPart(parentWidget, widgetName, m_enableViewSource, tqparent, name);
}
bool WHTMLPart::eventFilter(TQObject *watched, TQEvent *e)

4
quanta/parts/preview/whtmlpart.h
Unescape View File

@ -31,7 +31,7 @@ class WHTMLPart : public KHTMLPart {
Q_OBJECT
TQ_OBJECT
public:
WHTMLPart(TQWidget *tqparentWidget = 0, const char *widgetname = 0, bool enableViewSource = false,
WHTMLPart(TQWidget *parentWidget = 0, const char *widgetname = 0, bool enableViewSource = false,
TQObject *tqparent = 0, const char *name = 0, GUIProfile prof = DefaultGUI );
virtual ~WHTMLPart();
@ -61,7 +61,7 @@ signals:
protected:
virtual void urlSelected( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args = KParts::URLArgs());
virtual KParts::ReadOnlyPart *createPart( TQWidget *tqparentWidget, const char *widgetName,
virtual KParts::ReadOnlyPart *createPart( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const TQString &mimetype, TQString &serviceName,
TQStringList &serviceTypes, const TQStringList &params);

2
quanta/plugins/pluginconfig.ui
Unescape View File

@ -263,7 +263,7 @@
<slot>pluginType_highlighted(const QString&amp;)</slot>
<slot>slotPluginTypeHighlighted(const QString&amp;)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kicondialog.h</includehint>
</includehints>

2
quanta/plugins/plugineditor.ui
Unescape View File

@ -204,5 +204,5 @@
<tabstop>refreshButton</tabstop>
<tabstop>pluginList</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/project/eventconfigurationdlgs.ui
Unescape View File

@ -216,7 +216,7 @@
<slot>slotAddEvent()</slot>
<slot>slotDeleteEvent()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>

2
quanta/project/eventeditordlgs.ui
Unescape View File

@ -232,5 +232,5 @@
<Q_SLOTS>
<slot>slotActionChanged(const QString &amp;name)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/project/membereditdlgs.ui
Unescape View File

@ -181,7 +181,7 @@
<slot>slotMemberSelected()</slot>
<slot>slotSelectFromAddrBook()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>

16
quanta/project/project.cpp
Unescape View File

@ -149,10 +149,10 @@ void Project::insertFile(const KURL& nameURL, bool tqrepaint )
el.setAttribute("url", QuantaCommon::qUrl( QExtFileInfo::toRelative(url, d->baseURL) ));
d->dom.firstChild().firstChild().appendChild( el );
KURL u = url.upURL();
ProjectURL *tqparentURL = d->m_projectFiles.tqfind(u);
ProjectURL *parentURL = d->m_projectFiles.tqfind(u);
int uploadtqStatus = 1;
if (tqparentURL)
uploadtqStatus = tqparentURL->uploadtqStatus;
if (parentURL)
uploadtqStatus = parentURL->uploadtqStatus;
d->m_projectFiles.insert( new ProjectURL(url, "", uploadtqStatus, false, el) );
}
url.setPath(url.directory(false));
@ -658,14 +658,14 @@ void Project::slotOptions()
el = projectNode.namedItem("author").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el =d->dom.createElement("author");
projectNode.appendChild( el );
el.appendChild(d->dom.createTextNode( d->author ) );
el = projectNode.namedItem("email").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el =d->dom.createElement("email");
projectNode.appendChild( el );
el.appendChild(d->dom.createTextNode( d->email ) );
@ -673,7 +673,7 @@ void Project::slotOptions()
// Debugger
el =projectNode.namedItem("debuggerclient").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el =d->dom.createElement("debuggerclient");
projectNode.appendChild( el );
el.appendChild(d->dom.createTextNode( d->debuggerClient ) );
@ -684,7 +684,7 @@ void Project::slotOptions()
excludeStr = optionsPage.lineExclude->text();
el =projectNode.namedItem("exclude").toElement();
if (!el.isNull())
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
el =d->dom.createElement("exclude");
if (d->m_excludeCvsignore)
el.setAttribute("cvsignore", "true");
@ -1389,7 +1389,7 @@ void Project::loadCursorPosition(const KURL &url, KTextEditor::ViewCursorInterfa
QuantaCommon::setUrl(u2, el.attribute("url"));
if (!tqcontains(u2))
{
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
}
}
}

6
quanta/project/projectlist.cpp
Unescape View File

@ -74,7 +74,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL,
{
if (excludeRx.exactMatch(path) || tqfind(url.url(-1)))
{
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
modified = true;
i--;
} else
@ -89,7 +89,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL,
TQFileInfo fi( url.path() );
if ( !fi.exists() )
{
el.tqparentNode().removeChild( el );
el.parentNode().removeChild( el );
modified = true;
i--;
} else
@ -129,7 +129,7 @@ bool ProjectList::removeFromListAndXML(const KURL &url)
ProjectURL *p = tqfind(url);
if (p) {
TQDomElement el = p->domElement;
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
remove(url.url(-1));
return true;
}

6
quanta/project/projectnewfinals.ui
Unescape View File

@ -41,9 +41,9 @@
<height>32000</height>
</size>
</property>
<property name="tqlayoutMargin" stdset="0">
<property name="layoutMargin" stdset="0">
</property>
<property name="tqlayoutSpacing" stdset="0">
<property name="layoutSpacing" stdset="0">
</property>
<grid>
<property name="name">
@ -292,5 +292,5 @@
<tabstop>insertGlobalTemplates</tabstop>
<tabstop>insertLocalTemplates</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

6
quanta/project/projectnewgenerals.ui
Unescape View File

@ -44,9 +44,9 @@
<height>32000</height>
</size>
</property>
<property name="tqlayoutMargin" stdset="0">
<property name="layoutMargin" stdset="0">
</property>
<property name="tqlayoutSpacing" stdset="0">
<property name="layoutSpacing" stdset="0">
</property>
<grid>
<property name="name">
@ -450,5 +450,5 @@
<tabstop>radioLocal</tabstop>
<tabstop>radioWeb</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

6
quanta/project/projectnewlocals.ui
Unescape View File

@ -41,9 +41,9 @@
<height>32000</height>
</size>
</property>
<property name="tqlayoutMargin" stdset="0">
<property name="layoutMargin" stdset="0">
</property>
<property name="tqlayoutSpacing" stdset="0">
<property name="layoutSpacing" stdset="0">
</property>
<grid>
<property name="name">
@ -337,7 +337,7 @@
<tabstop>addFolder</tabstop>
<tabstop>clearList</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>uploadtreeview.h</includehint>
</includehints>

6
quanta/project/projectnewwebs.ui
Unescape View File

@ -41,9 +41,9 @@
<height>32000</height>
</size>
</property>
<property name="tqlayoutMargin" stdset="0">
<property name="layoutMargin" stdset="0">
</property>
<property name="tqlayoutSpacing" stdset="0">
<property name="layoutSpacing" stdset="0">
</property>
<grid>
<property name="name">
@ -283,7 +283,7 @@
<tabstop>commandLine</tabstop>
<tabstop>button</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kled.h</includehint>
<includehint>uploadtreeview.h</includehint>

2
quanta/project/projectoptions.ui
Unescape View File

@ -536,5 +536,5 @@
<slot>buttonToolbar_clicked()</slot>
<slot>comboDebuggerClient_activated( int idx )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

8
quanta/project/projectprivate.cpp
Unescape View File

@ -887,7 +887,7 @@ void ProjectPrivate::slotDeleteProjectView(const TQString &view)
el = node.cloneNode().toElement();
if (el.attribute("name") == view)
{
node.tqparentNode().removeChild(node);
node.parentNode().removeChild(node);
if (currentProjectView == view)
currentProjectView = "";
tqparent->setModified();
@ -919,7 +919,7 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName)
KMessageBox::warningContinueCancel(m_mainWindow, i18n("<qt>A project view named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>")
.tqarg(currentProjectView), TQString(), i18n("Overwrite")) == KMessageBox::Continue)
{
node.tqparentNode().removeChild(node);
node.parentNode().removeChild(node);
break;
} else
{
@ -1095,7 +1095,7 @@ void ProjectPrivate::getStatusFromTree()
for ( unsigned int i = 0; i < nl.count(); i++ )
{
el = nl.item(i).toElement();
el.tqparentNode().removeChild( el );
el.parentNode().removeChild( el );
i--;
}
TQStringList folderList;
@ -1263,7 +1263,7 @@ bool ProjectPrivate::saveProject()
el = nl.item(i).toElement();
if ( el.nodeName() == "openfile" )
{
el.tqparentNode().removeChild( el );
el.parentNode().removeChild( el );
i--;
}
}

2
quanta/project/projectupload.cpp
Unescape View File

@ -800,7 +800,7 @@ void ProjectUpload::loadRemoteUploadInfo()
void ProjectUpload::saveRemoteUploadInfo()
{
TQDomNode tqparent = m_currentProfileElement.tqparentNode();
TQDomNode tqparent = m_currentProfileElement.parentNode();
TQDomNode profileNode = m_currentProfileElement.cloneNode(false);
tqparent.removeChild(m_currentProfileElement);
tqparent.appendChild(profileNode);

2
quanta/project/projectuploads.ui
Unescape View File

@ -490,7 +490,7 @@
<slot>slotRemoveProfile()</slot>
<slot>slotNewProfileSelected(const QString&amp;)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>uploadtreeview.h</includehint>
</includehints>

2
quanta/project/rescanprjdir.ui
Unescape View File

@ -247,7 +247,7 @@
<tabstop>buttonCancel</tabstop>
<tabstop>buttonHelp</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kprogress.h</includehint>
<includehint>uploadtreeview.h</includehint>

2
quanta/project/subprojecteditdlgs.ui
Unescape View File

@ -69,5 +69,5 @@
<tabstop>locationEdit</tabstop>
<tabstop>createNew</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/project/teammembersdlgs.ui
Unescape View File

@ -237,7 +237,7 @@
<slot>slotDeleteMember()</slot>
<slot>slotSetToYourself()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>

2
quanta/project/uploadprofiledlgs.ui
Unescape View File

@ -306,5 +306,5 @@ is obscured, saving the password in any file is a security risk. Use this option
<tabstop>okButton</tabstop>
<tabstop>cancelButton</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/project/uploadprofiles.cpp
Unescape View File

@ -60,7 +60,7 @@ bool UploadProfiles::removeFromMapAndXML(const TQString &name)
return false;
// ok now remove
TQDomElement el = (*it).domElement;
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
erase(name);
return true;
}

2
quanta/project/uploadprofilespage.ui
Unescape View File

@ -121,5 +121,5 @@
<Q_SLOTS>
<slot>buttonEditProfiles_clicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

30
quanta/quanta_uml.xmi
Unescape View File

@ -104,7 +104,7 @@
</UML:Operation>
<UML:Operation stereotype="" package="" xmi.id="243" type="uint" abstract="0" documentation="" name="readTagFile" static="0" scope="202" >
<UML:Parameter stereotype="" package="" xmi.id="244" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="fileName" static="0" scope="200" />
<UML:Parameter stereotype="" package="" xmi.id="245" value="" type="DTDStruct *" abstract="0" documentation="" name="tqparentDTD" static="0" scope="200" />
<UML:Parameter stereotype="" package="" xmi.id="245" value="" type="DTDStruct *" abstract="0" documentation="" name="parentDTD" static="0" scope="200" />
<UML:Parameter stereotype="" package="" xmi.id="246" value="" type="QTagList *" abstract="0" documentation="" name="tagList" static="0" scope="200" />
</UML:Operation>
<UML:Operation stereotype="" package="" xmi.id="247" type="void" abstract="0" documentation="" name="removeContainer" static="0" scope="200" >
@ -765,7 +765,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
<UML:Attribute stereotype="" package="" xmi.id="660" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="commonGroups" static="0" scope="200" />
<UML:Attribute stereotype="" package="" xmi.id="661" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_fileName" static="0" scope="202" />
<UML:Attribute stereotype="" package="" xmi.id="662" value="" type="bool" abstract="0" documentation="" name="optional" static="0" scope="202" />
<UML:Attribute stereotype="" package="" xmi.id="663" value="" type="DTDStruct *" abstract="0" documentation="" name="tqparentDTD" static="0" scope="200" />
<UML:Attribute stereotype="" package="" xmi.id="663" value="" type="DTDStruct *" abstract="0" documentation="" name="parentDTD" static="0" scope="200" />
<UML:Attribute stereotype="" package="" xmi.id="664" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="returnType" static="0" scope="200" />
<UML:Attribute stereotype="" package="" xmi.id="665" value="" type="bool" abstract="0" documentation="" name="single" static="0" scope="202" />
<UML:Attribute stereotype="" package="" xmi.id="666" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="stoppingTags" static="0" scope="200" />
@ -1088,12 +1088,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
</UML:Class>
<UML:Class stereotype="" package="" xmi.id="950" abstract="0" documentation="An extended KListViewItem for folders." name="FilesTreeFolder" static="0" scope="200" >
<UML:Operation stereotype="" package="" xmi.id="955" type="" abstract="0" documentation="" name="FilesTreeFolder" static="0" scope="200" >
<UML:Parameter stereotype="" package="" xmi.id="956" value="" type="QListView *" abstract="0" documentation="" name="tqparentListView" static="0" scope="200" />
<UML:Parameter stereotype="" package="" xmi.id="956" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" />
<UML:Parameter stereotype="" package="" xmi.id="957" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
<UML:Parameter stereotype="" package="" xmi.id="958" value="" type="const KURL &amp;" abstract="0" documentation="" name="p_url" static="0" scope="200" />
</UML:Operation>
<UML:Operation stereotype="" package="" xmi.id="959" type="" abstract="0" documentation="" name="FilesTreeFolder" static="0" scope="200" >
<UML:Parameter stereotype="" package="" xmi.id="960" value="" type="QListView *" abstract="0" documentation="" name="tqparentListView" static="0" scope="200" />
<UML:Parameter stereotype="" package="" xmi.id="960" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" />
<UML:Parameter stereotype="" package="" xmi.id="961" value="" type="const QString &amp;" abstract="0" documentation="" name="p_name" static="0" scope="200" />
<UML:Parameter stereotype="" package="" xmi.id="962" value="" type="const KURL &amp;" abstract="0" documentation="" name="p_url" static="0" scope="200" />
</UML:Operation>
@ -1122,8 +1122,8 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
</UML:Operation>
<UML:Operation stereotype="" package="" xmi.id="980" type="virtual " abstract="0" documentation="" name="~FilesTreeFolder" static="0" scope="200" />
<UML:Attribute stereotype="" package="" xmi.id="951" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" />
<UML:Attribute stereotype="" package="" xmi.id="952" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="tqparentFolder" static="0" scope="200" />
<UML:Attribute stereotype="" package="" xmi.id="953" value="" type="FilesTreeView *" abstract="0" documentation="" name="tqparentView" static="0" scope="202" />
<UML:Attribute stereotype="" package="" xmi.id="952" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="parentFolder" static="0" scope="200" />
<UML:Attribute stereotype="" package="" xmi.id="953" value="" type="FilesTreeView *" abstract="0" documentation="" name="parentView" static="0" scope="202" />
<UML:Attribute stereotype="" package="" xmi.id="954" value="" type="KURL" abstract="0" documentation="" name="url" static="0" scope="200" />
</UML:Class>
<UML:Class stereotype="" package="" xmi.id="981" abstract="0" documentation="An extended KLIstViewItem for files." name="FilesTreeFile" static="0" scope="200" >
@ -1218,16 +1218,16 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
<UML:Operation stereotype="" package="" xmi.id="1053" type="KURL" abstract="0" documentation="" name="url" static="0" scope="200" />
<UML:Operation stereotype="" package="" xmi.id="1054" type="virtual " abstract="0" documentation="" name="~UploadTreeFolder" static="0" scope="200" />
<UML:Attribute stereotype="" package="" xmi.id="1034" value="" type="KURL" abstract="0" documentation="" name="m_url" static="0" scope="200" />
<UML:Attribute stereotype="" package="" xmi.id="1035" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="tqparentFolder" static="0" scope="200" />
<UML:Attribute stereotype="" package="" xmi.id="1035" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="parentFolder" static="0" scope="200" />
</UML:Class>
<UML:Class stereotype="" package="" xmi.id="1055" abstract="0" documentation="Item for project folders." name="ProjectTreeFolder" static="0" scope="200" >
<UML:Operation stereotype="" package="" xmi.id="1059" type="" abstract="0" documentation="" name="ProjectTreeFolder" static="0" scope="200" >
<UML:Parameter stereotype="" package="" xmi.id="1060" value="" type="QListView *" abstract="0" documentation="" name="tqparentListView" static="0" scope="200" />
<UML:Parameter stereotype="" package="" xmi.id="1060" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" />
<UML:Parameter stereotype="" package="" xmi.id="1061" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
<UML:Parameter stereotype="" package="" xmi.id="1062" value="" type="const KURL &amp;" abstract="0" documentation="" name="p_url" static="0" scope="200" />
</UML:Operation>
<UML:Operation stereotype="" package="" xmi.id="1063" type="" abstract="0" documentation="" name="ProjectTreeFolder" static="0" scope="200" >
<UML:Parameter stereotype="" package="" xmi.id="1064" value="" type="QListView *" abstract="0" documentation="" name="tqparentListView" static="0" scope="200" />
<UML:Parameter stereotype="" package="" xmi.id="1064" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" />
<UML:Parameter stereotype="" package="" xmi.id="1065" value="" type="const QString &amp;" abstract="0" documentation="" name="name" static="0" scope="200" />
<UML:Parameter stereotype="" package="" xmi.id="1066" value="" type="const KURL &amp;" abstract="0" documentation="" name="p_url" static="0" scope="200" />
</UML:Operation>
@ -1251,7 +1251,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
<UML:Operation stereotype="" package="" xmi.id="1080" type="void" abstract="0" documentation="" name="setup" static="0" scope="200" />
<UML:Operation stereotype="" package="" xmi.id="1081" type="" abstract="0" documentation="" name="~ProjectTreeFolder" static="0" scope="200" />
<UML:Attribute stereotype="" package="" xmi.id="1056" value="" type="QPtrList" abstract="0" documentation="" name="filesTreeList" static="0" scope="200" />
<UML:Attribute stereotype="" package="" xmi.id="1057" value="" type="ProjectTreeView *" abstract="0" documentation="" name="tqparentView" static="0" scope="202" />
<UML:Attribute stereotype="" package="" xmi.id="1057" value="" type="ProjectTreeView *" abstract="0" documentation="" name="parentView" static="0" scope="202" />
<UML:Attribute stereotype="" package="" xmi.id="1058" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="path" static="0" scope="200" />
</UML:Class>
<UML:Class stereotype="" package="" xmi.id="1082" abstract="0" documentation="Item for project files. It's different from a standard file as the project files are basically XML tag elements." name="ProjectTreeFile" static="0" scope="200" >
@ -2637,8 +2637,8 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
<listitem open="0" type="815" id="968" label="init" />
<listitem open="0" type="815" id="969" label="key" />
<listitem open="0" type="814" id="951" label="name" />
<listitem open="0" type="814" id="952" label="tqparentFolder" />
<listitem open="0" type="814" id="953" label="tqparentView" />
<listitem open="0" type="814" id="952" label="parentFolder" />
<listitem open="0" type="814" id="953" label="parentView" />
<listitem open="0" type="815" id="972" label="setOpen" />
<listitem open="0" type="815" id="974" label="setup" />
<listitem open="0" type="815" id="975" label="sortChildItems" />
@ -2807,7 +2807,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
<listitem open="0" type="814" id="1056" label="filesTreeList" />
<listitem open="0" type="815" id="1069" label="insertItem" />
<listitem open="0" type="815" id="1072" label="paintCell" />
<listitem open="0" type="814" id="1057" label="tqparentView" />
<listitem open="0" type="814" id="1057" label="parentView" />
<listitem open="0" type="814" id="1058" label="path" />
<listitem open="0" type="815" id="1078" label="setOpen" />
<listitem open="0" type="815" id="1080" label="setup" />
@ -2875,7 +2875,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
<listitem open="0" type="814" id="661" label="m_fileName" />
<listitem open="0" type="815" id="685" label="name" />
<listitem open="0" type="814" id="662" label="optional" />
<listitem open="0" type="814" id="663" label="tqparentDTD" />
<listitem open="0" type="814" id="663" label="parentDTD" />
<listitem open="0" type="814" id="664" label="returnType" />
<listitem open="0" type="815" id="686" label="setFileName" />
<listitem open="0" type="815" id="688" label="setName" />
@ -3395,7 +3395,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
<listitem open="0" type="815" id="1044" label="fullName" />
<listitem open="0" type="815" id="1045" label="key" />
<listitem open="0" type="814" id="1034" label="m_url" />
<listitem open="0" type="814" id="1035" label="tqparentFolder" />
<listitem open="0" type="814" id="1035" label="parentFolder" />
<listitem open="0" type="815" id="1048" label="setOpen" />
<listitem open="0" type="815" id="1050" label="setWhichPixmap" />
<listitem open="0" type="815" id="1052" label="setup" />

2
quanta/scripts/TemplateMagic.pl
Unescape View File

@ -217,7 +217,7 @@ print OFH <<E
</property>
</widget>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>
E

2
quanta/scripts/checkxml.kmdr
Unescape View File

@ -282,5 +282,5 @@ checkXML index.docbook 2&gt;&amp;1</string>
<tabstop>ExecButton2</tabstop>
<tabstop>CloseButton1</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/scripts/docbook_table.kmdr
Unescape View File

@ -246,5 +246,5 @@ echo ' &lt;/thead&gt;';</string>
<tabstop>CloseButton1</tabstop>
<tabstop>CloseButton1_2</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/scripts/dwt.kmdr
Unescape View File

@ -188,5 +188,5 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/scripts/gubed_install.kmdr
Unescape View File

@ -291,5 +291,5 @@ rmdir /tmp/gubed-install &gt; /dev/null
</property>
</widget>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

10
quanta/scripts/htmlquickstart.kmdr
Unescape View File

@ -30,14 +30,14 @@
<stringlist>
<string></string>
<string>@execBegin
quanta=`dcop quanta-@tqparentPid`
quanta=`dcop quanta-@parentPid`
if [ -z "$quanta" ]; then
quanta=`dcop quanta`
if [ ! -z "$quanta" ]; then
quantadcop=quanta
fi
else
quantadcop=quanta-@tqparentPid
quantadcop=quanta-@parentPid
fi
if [ ! -z "$quantadcop" ]; then
@ -161,14 +161,14 @@ echo '@CBPHPFooter'
echo '&lt;/body&gt;'
echo '&lt;/html&gt;'
quanta=`dcop quanta-@tqparentPid`
quanta=`dcop quanta-@parentPid`
if [ -z "$quanta" ]; then
quanta=`dcop quanta`
if [ ! -z "$quanta" ]; then
quantadcop=quanta
fi
else
quantadcop=quanta-@tqparentPid
quantadcop=quanta-@parentPid
fi
if [ ! -z "$quantadcop" ]; then
@ -983,5 +983,5 @@ echo "$PADDING&lt;/script&gt;"</string>
<tabstop>CloseButton1</tabstop>
<tabstop>CloseButton1_2</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/scripts/listwizard.kmdr
Unescape View File

@ -437,5 +437,5 @@ Here is one example of a variablelist:
<tabstop>CloseButton1_2</tabstop>
<tabstop>ItemizedOption</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/scripts/meinproc.kmdr
Unescape View File

@ -280,5 +280,5 @@ fi</string>
<tabstop>ExecButton2</tabstop>
<tabstop>CloseButton1</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/scripts/picturewizard.kmdr
Unescape View File

@ -583,5 +583,5 @@ echo '&lt;/inlinemediaobject&gt;'</string>
<tabstop>CloseButton1_2</tabstop>
<tabstop>MediaOption</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/scripts/scriptinfo.kmdr
Unescape View File

@ -450,5 +450,5 @@ $options&lt;name&gt;@Name&lt;/name&gt;
<tabstop>TabWidget1</tabstop>
<tabstop>TextEdit3</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/scripts/tablewizard.kmdr
Unescape View File

@ -445,5 +445,5 @@ Select the table type:
<tabstop>OKButton</tabstop>
<tabstop>CloseButton1_2</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/scripts/tidy.kmdr
Unescape View File

@ -1074,5 +1074,5 @@ fi
<slot>setWidgetText(const QString&amp;)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/scripts/xmlval.kmdr
Unescape View File

@ -495,5 +495,5 @@ xmllint $CMDLINE 2&gt;&amp;1
<slot>setDisabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
quanta/scripts/xsltproc.kmdr
Unescape View File

@ -290,5 +290,5 @@ fi</string>
<slot>setDisabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

36
quanta/src/document.cpp
Unescape View File

@ -565,9 +565,9 @@ bool Document::insertChildTags(TQTag *tag, TQTag *lastTag)
if (it.data())
{
childInserted = true;
TQTag *childTag = QuantaCommon::tagFromDTD(tag->tqparentDTD, it.key());
TQTag *childTag = QuantaCommon::tagFromDTD(tag->parentDTD, it.key());
TQString tagStr =QuantaCommon::tagCase(it.key());
if ( tag->tqparentDTD->singleTagStyle == "xml" &&
if ( tag->parentDTD->singleTagStyle == "xml" &&
( childTag->isSingle() ||
(childTag->isOptional() && !qConfig.closeOptionalTags)) )
{
@ -1000,7 +1000,7 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string)
if ( string == ">" && tagName[0] != '/' && !tagName.endsWith("/") &&
!s.endsWith("/>") && tag)
{
if ( tag->tqparentDTD->singleTagStyle == "xml" &&
if ( tag->parentDTD->singleTagStyle == "xml" &&
(tag->isSingle() || (!qConfig.closeOptionalTags && tag->isOptional()))
)
{
@ -1125,7 +1125,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getGroupCompletions(Node *n
GroupElementList elementList = it.data();
for (uint i = 0; i < elementList.count(); i++)
{
if (elementList[i]->tqparentNode == 0L || elementList[i]->global)
if (elementList[i]->parentNode == 0L || elementList[i]->global)
{
completion.text = it.key().section('|', -1).stripWhiteSpace();
completions->append(completion);
@ -1133,11 +1133,11 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getGroupCompletions(Node *n
} else
{
Node *n = node;
while (n && n != elementList[i]->tqparentNode)
while (n && n != elementList[i]->parentNode)
{
n = n->tqparent;
}
if (n == elementList[i]->tqparentNode)
if (n == elementList[i]->parentNode)
{
completion.text = it.key().section('|', -1).stripWhiteSpace();
completions->append(completion);
@ -1172,15 +1172,15 @@ bool Document::isDerivatedFrom(const TQString& className, const TQString &baseCl
if (className.isEmpty() || !completionDTD->classInheritance.tqcontains(className))
return false;
TQString tqparentClass = completionDTD->classInheritance[className];
TQString parentClass = completionDTD->classInheritance[className];
int result = 0;
do {
if (tqparentClass == baseClass)
if (parentClass == baseClass)
result = 1; //className extends baseClass
else
{
if (completionDTD->classInheritance.tqcontains(tqparentClass))
tqparentClass = completionDTD->classInheritance[tqparentClass];
if (completionDTD->classInheritance.tqcontains(parentClass))
parentClass = completionDTD->classInheritance[parentClass];
else
result = -1;//nothing was found in the inheritance list
}
@ -1208,9 +1208,9 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
node = node->tqparent;
if (node && node->tag->type != Tag::XmlTag)
node = 0L;
TQTag *tqparentTQTag= 0L;
TQTag *parentTQTag= 0L;
if (node && node->tqparent)
tqparentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
parentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
TQString textLine = editIf->textLine(line).left(col);
TQString word = findWordRev(textLine, completionDTD).upper();
TQString classStr = "";
@ -1229,7 +1229,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
objStr = r->cap(1);
if (objStr == "this")
{
TQString tqparentGroupStr = "";
TQString parentGroupStr = "";
bool classFound = false;
parser->synchParseInDetail();
Node *n = parser->nodeAt(line, col);
@ -1244,11 +1244,11 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
while (it != n->m_groupElements.end())
{
GroupElement *e = *it;
if (tqparentGroupStr.isEmpty() && e->group->appendToTags)
if (parentGroupStr.isEmpty() && e->group->appendToTags)
{
tqparentGroupStr = e->group->tqparentGroup;
parentGroupStr = e->group->parentGroup;
}
if (!tqparentGroupStr.isEmpty() && e->group->name == tqparentGroupStr)
if (!parentGroupStr.isEmpty() && e->group->name == parentGroupStr)
{
classStr = e->tag->name;
classFound = true;
@ -1301,7 +1301,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
tagName = tag->name();
if (!tagName.isEmpty() && tagName.upper().startsWith(word))
{
if (!tqparentTQTag || (tqparentTQTag && tqparentTQTag->isChild(tagName)))
if (!parentTQTag || (parentTQTag && parentTQTag->isChild(tagName)))
{
tagName = tag->name() + TQString("%1").tqarg(i, 10);
tagNameList += tagName;
@ -1438,7 +1438,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getAttributeCompletions(con
//list common attributes for this tag
for (TQStringList::Iterator it = tag->commonGroups.begin(); it != tag->commonGroups.end(); ++it)
{
AttributeList *attrs = tag->tqparentDTD->commonAttrs->tqfind(*it);
AttributeList *attrs = tag->parentDTD->commonAttrs->tqfind(*it);
for (uint j = 0; j < attrs->count(); j++)
{
TQString name = attrs->at(j)->name;

26
quanta/src/dtds.cpp
Unescape View File

@ -322,7 +322,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
delete tag;
continue; //skip this tag
}
tag->tqparentDTD = dtd;
tag->parentDTD = dtd;
//read the possible stopping tags
TQStrList stoppingTags;
dtdConfig->readListEntry(tag->name() + "_stoppingtags",stoppingTags);
@ -547,7 +547,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
group.hasDefinitionRx = !group.definitionRx.pattern().isEmpty();
group.isMinimalDefinitionRx = dtdConfig->readBoolEntry("DefinitionRx_Minimal", false);
group.appendToTags = dtdConfig->readBoolEntry("AppendToTags", false);
group.tqparentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace();
group.parentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace();
tagStr = dtdConfig->readEntry("TagType", "Text").stripWhiteSpace();
if (tagStr == "XmlTag")
group.tagType = Tag::XmlTag;
@ -588,7 +588,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
group.noName = dtdConfig->readEntry("No_Name").stripWhiteSpace();
group.icon = dtdConfig->readEntry("Icon").stripWhiteSpace();
group.appendToTags = dtdConfig->readBoolEntry("AppendToTags", false);
group.tqparentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace();
group.parentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace();
TQString tagStr = dtdConfig->readEntry("Tag").stripWhiteSpace();
if (!tagStr.isEmpty())
{
@ -667,7 +667,7 @@ void DTDs::resolveInherited (DTDStruct *dtd)
/** Reads the tags for the tag files. Returns the number of read tags. */
uint DTDs::readTagFile(const TQString& fileName, DTDStruct* tqparentDTD, TQTagList *tagList)
uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, TQTagList *tagList)
{
// kdDebug(24000) << "dtds::readTagFile:" << fileName << endl;
TQFile f(fileName);
@ -702,13 +702,13 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* tqparentDTD, TQTagLi
TQString extends = e.attribute("extends");
TQString name = e.attribute("name");
if (!name.isEmpty() && !extends.isEmpty())
tqparentDTD->classInheritance[name] = extends;
parentDTD->classInheritance[name] = extends;
continue;
}
TQTag *tag = new TQTag();
tag->setName(e.attribute("name"));
tag->setFileName(fileName);
tag->tqparentDTD = tqparentDTD;
tag->parentDTD = parentDTD;
bool common = false;
setAttributes(&n, tag, common);
if (common)
@ -720,10 +720,10 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* tqparentDTD, TQTagLi
commonAttrList->setAutoDelete(true);
*commonAttrList = *attrs;
//delete tag;
tqparentDTD->commonAttrs->insert(groupName, commonAttrList);
parentDTD->commonAttrs->insert(groupName, commonAttrList);
} else
{
if (tqparentDTD->caseSensitive)
if (parentDTD->caseSensitive)
{
tagList->tqreplace(tag->name(), tag); //append the tag to the list for this DTD
} else
@ -750,9 +750,9 @@ void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common)
tmpStr = el.attribute("common");
if ((tmpStr != "1" && tmpStr != "yes")) //in case of common tags, we are not interested in these options
{
if (tag->tqparentDTD->commonAttrs)
if (tag->parentDTD->commonAttrs)
{
TQDictIterator<AttributeList> it(*(tag->tqparentDTD->commonAttrs));
TQDictIterator<AttributeList> it(*(tag->parentDTD->commonAttrs));
for( ; it.current(); ++it )
{
TQString lookForAttr = "has" + TQString(it.currentKey()).stripWhiteSpace();
@ -804,7 +804,7 @@ void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common)
if (tmpStr == "child")
{
TQString childTag = item.attribute("name");
if (!tag->tqparentDTD->caseSensitive)
if (!tag->parentDTD->caseSensitive)
childTag = childTag.upper();
tag->childTags.insert(childTag, item.attribute("usage") == "required");
}
@ -820,7 +820,7 @@ void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common)
if (item.tagName() == "stoppingtag")
{
TQString stopTag = item.attribute("name");
if (!tag->tqparentDTD->caseSensitive)
if (!tag->parentDTD->caseSensitive)
stopTag = stopTag.upper();
tag->stoppingTags.append(stopTag);
}
@ -837,7 +837,7 @@ void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common)
attr->method = el.attribute("method");
attr->arguments = el.attribute("arguments");
attr->type = el.attribute("type",tag->tqparentDTD->defaultAttrType);
attr->type = el.attribute("type",tag->parentDTD->defaultAttrType);
attr->defaultValue = el.attribute("defaultValue");
attr->status = el.attribute("status");

4
quanta/src/dtds.h
Unescape View File

@ -209,11 +209,11 @@ private:
/** Reads the tags from the tag files.
*
* @param fileName path of the tag file
* @param tqparentDTD the DTD where the tags belog to
* @param parentDTD the DTD where the tags belog to
* @param tagList the list where the tags are inserted
* @return the number of read tags.
*/
uint readTagFile(const TQString& fileName, DTDStruct* tqparentDTD, TQTagList *tagList);
uint readTagFile(const TQString& fileName, DTDStruct* parentDTD, TQTagList *tagList);
/** Parses the dom document and retrieve the tag attributes
*

38
quanta/src/quanta.cpp
Unescape View File

@ -1026,7 +1026,7 @@ void QuantaApp::slotOptionsConfigureKeys()
el.setAttribute("shortcut", action->shortcut().toString());
el = node.toElement();
node = node.nextSibling();
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
} else
{
node = node.nextSibling();
@ -2846,7 +2846,7 @@ void QuantaApp::slotRenameToolbar(const TQString& name)
{
if (tb->id(i) == name)
{
tb->setTabLabel(tb->page(i)->tqparentWidget(), i18n(p_toolbar->name.utf8()));
tb->setTabLabel(tb->page(i)->parentWidget(), i18n(p_toolbar->name.utf8()));
m_tagsMenu->changeItem(m_tagsMenu->idAt(i + 2), i18n(p_toolbar->name.utf8()));
break;
}
@ -2920,7 +2920,7 @@ void QuantaApp::slotDeleteAction(KAction *action)
//we found a toolbar that contains the action
if (nodeList.item(j).toElement().attribute("name") == actionName)
{
nodeList.item(j).tqparentNode().removeChild(nodeList.item(j));
nodeList.item(j).parentNode().removeChild(nodeList.item(j));
KXMLGUIFactory::saveConfigFile(guiClient->domDocument(), guiClient->xmlFile());
break;
}
@ -2976,7 +2976,7 @@ void QuantaApp::slotRemoveAction(const TQString& toolbarName, const TQString& a_
{
action->unplug(ToolbarTabWidget::ref()->page(toolbarName));
action->unplug(p_toolbar->menu);
node.tqparentNode().removeChild(node);
node.parentNode().removeChild(node);
}
node = node.nextSibling();
}
@ -4445,13 +4445,13 @@ void QuantaApp::slotInsertCSS()
while (styleNode && styleNode->tqparent && styleNode->tag->name.lower() != "style" && styleNode->tag->dtd()->name == "text/css")
styleNode = styleNode->tqparent;
Node *tqparentNode = node;
if (tqparentNode->tag->type == Tag::XmlTagEnd && tqparentNode->prev)
tqparentNode = tqparentNode->prev;
Node *parentNode = node;
if (parentNode->tag->type == Tag::XmlTagEnd && parentNode->prev)
parentNode = parentNode->prev;
else
while (tqparentNode && tqparentNode->tqparent &&
tqparentNode->tag->type != Tag::XmlTag)
tqparentNode = tqparentNode->tqparent;
while (parentNode && parentNode->tqparent &&
parentNode->tag->type != Tag::XmlTag)
parentNode = parentNode->tqparent;
TQString fullDocument = w->editIf->text().stripWhiteSpace();
if (styleNode->tag->name.lower() == "comment block" && styleNode->tqparent) {
@ -4513,29 +4513,29 @@ void QuantaApp::slotInsertCSS()
}
delete dlg;
} else
if (tqparentNode && tqparentNode->tag->type == Tag::XmlTag)
if (parentNode && parentNode->tag->type == Tag::XmlTag)
{
kdDebug(24000) << "[CSS editor] We will add a style attribute to: " << tqparentNode->tag->name << endl;
kdDebug(24000) << "[CSS editor] We will add a style attribute to: " << parentNode->tag->name << endl;
CSSEditor *dlg = new CSSEditor(this);
TQFileInfo fi(ViewManager::ref()->currentURL());
dlg->setFileToPreview(projectBaseURL().path() + fi.baseName(),false);
tqparentNode->tag->beginPos(bLine, bCol);
tqparentNode->tag->endPos(eLine, eCol);
parentNode->tag->beginPos(bLine, bCol);
parentNode->tag->endPos(eLine, eCol);
dlg->setFooter(">" + w->text(eLine, eCol + 1, lastLine, lastCol));
TQString temp;
if (tqparentNode->tag->hasAttribute("style"))
if (parentNode->tag->hasAttribute("style"))
{
dlg->setInlineStyleContent(tqparentNode->tag->attributeValue("style"));
Tag tempTag(*(tqparentNode->tag));
dlg->setInlineStyleContent(parentNode->tag->attributeValue("style"));
Tag tempTag(*(parentNode->tag));
tempTag.deleteAttribute("style");
temp = tempTag.toString();
} else {
dlg->setInlineStyleContent(TQString());
temp = tqparentNode->tag->toString();
temp = parentNode->tag->toString();
}
//using TQString::mid sometimes generates strange results; maybe this is due to a (random) blank in temp
temp = temp.left(temp.length()-1);//remove >
@ -4545,7 +4545,7 @@ void QuantaApp::slotInsertCSS()
dlg->initialize();
if( dlg->exec() )
{
w->changeTagAttribute(tqparentNode->tag, "style", dlg->generateProperties());
w->changeTagAttribute(parentNode->tag, "style", dlg->generateProperties());
}
delete dlg;
} else

2
quanta/src/quanta_init.cpp
Unescape View File

@ -229,7 +229,7 @@ void QuantaInit::initQuanta()
TQDomElement el = node.toElement();
m_quanta->oldShortcuts.insert(el.attribute("name"), el.attribute("shortcut"));
node = node.nextSibling();
el.tqparentNode().removeChild(el);
el.parentNode().removeChild(el);
} else
{
node = node.nextSibling();

4
quanta/src/quantadoc.cpp
Unescape View File

@ -292,7 +292,7 @@ void QuantaDoc::slotAttribPopup()
for (TQStringList::Iterator it = qtag->commonGroups.begin(); it != qtag->commonGroups.end(); ++it)
{
TQPopupMenu* popUpMenu = new TQPopupMenu(attribMenu, (*it).latin1());
AttributeList *attrs = qtag->tqparentDTD->commonAttrs->tqfind(*it);
AttributeList *attrs = qtag->parentDTD->commonAttrs->tqfind(*it);
for (uint j = 0; j < attrs->count(); j++)
{
name = attrs->at(j)->name;
@ -348,7 +348,7 @@ void QuantaDoc::slotInsertAttrib( int id )
TQTag* qtag = QuantaCommon::tagFromDTD(w->getDTDIdentifier(), tagName);
for (TQStringList::Iterator it = qtag->commonGroups.begin(); it != qtag->commonGroups.end(); ++it)
{
AttributeList *attrs = qtag->tqparentDTD->commonAttrs->tqfind(*it);
AttributeList *attrs = qtag->parentDTD->commonAttrs->tqfind(*it);
menuId += attrs->count();
if (id <= menuId)
{

2
quanta/src/quantaview.cpp
Unescape View File

@ -846,7 +846,7 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString
if (!nodeTQTag)
return;
qTagList = nodeTQTag->tqparents();
qTagList = nodeTQTag->parents();
#ifdef HEAVY_DEBUG
kdDebug(25001)<< "nodeTQTag name : " << nodeTQTag->name() << endl;
/**kdDebug(25001)<< nodeTQTag->isChild("#text", false) << endl;

4
quanta/src/viewmanager.cpp
Unescape View File

@ -257,7 +257,7 @@ void ViewManager::slotCloseOtherTabs()
if (dynamic_cast<QuantaView*>(currentView) && !static_cast<QuantaView*>(currentView)->document())
ToolbarTabWidget::ref()->reparent(0, 0, TQPoint(), false);
KMdiIterator<KMdiChildView*> *it = quantaApp->createIterator();
//save the tqchildren first to a list, as removing tqinvalidates our iterator
//save the tqchildren first to a list, as removing invalidates our iterator
TQValueList<KMdiChildView *> tqchildren;
for (it->first(); !it->isDone(); it->next())
{
@ -427,7 +427,7 @@ bool ViewManager::closeAll(bool createNew)
parser->setSAParserEnabled(false);
KMdiIterator<KMdiChildView*> *it = quantaApp->createIterator();
QuantaView *view;
//save the tqchildren first to a list, as removing tqinvalidates our iterator
//save the tqchildren first to a list, as removing invalidates our iterator
TQValueList<KMdiChildView *> tqchildren;
for (it->first(); !it->isDone(); it->next())
{

2
quanta/treeviews/basetreeview.cpp
Unescape View File

@ -86,7 +86,7 @@ BaseTreeViewToolTip::BaseTreeViewToolTip( TQWidget *tqparent, BaseTreeView *lv )
void BaseTreeViewToolTip::maybeTip( const TQPoint &pos )
{
if ( !tqparentWidget() || !m_view || !m_view->showToolTips() )
if ( !parentWidget() || !m_view || !m_view->showToolTips() )
return;
TQListViewItem *item = m_view->itemAt(pos);

2
quanta/treeviews/fileinfodlg.ui
Unescape View File

@ -90,5 +90,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

8
quanta/treeviews/quantapropertiespage.ui
Unescape View File

@ -59,7 +59,7 @@
</property>
<widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>tqparentAttr</cstring>
<cstring>parentAttr</cstring>
</property>
<property name="text">
<string>&amp;Inherit type from tqparent (nothing)</string>
@ -221,7 +221,7 @@
</widget>
<connections>
<connection>
<sender>tqparentAttr</sender>
<sender>parentAttr</sender>
<signal>toggled(bool)</signal>
<receiver>typesCombo</receiver>
<slot>setDisabled(bool)</slot>
@ -241,7 +241,7 @@
</connections>
<tabstops>
<tabstop>typesCombo</tabstop>
<tabstop>tqparentAttr</tabstop>
<tabstop>parentAttr</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

32
quanta/treeviews/structtreetag.cpp
Unescape View File

@ -37,14 +37,14 @@ StructTreeTag::StructTreeTag(TQListView *tqparent, TQString a_title)
node = 0L;
hasOpenFileMenu = false;
groupTag = 0L;
tqparentTree = static_cast<StructTreeView*>(tqparent);
parentTree = static_cast<StructTreeView*>(tqparent);
}
StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQString a_title,
TQListViewItem *after )
: KListViewItem(tqparent, after, a_title)
{
tqparentTree = tqparent->tqparentTree;
parentTree = tqparent->parentTree;
hasOpenFileMenu = false;
groupTag = 0L;
static const TQString space = " ";
@ -105,36 +105,36 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQStri
if (!typingInProgress)
{
TQTag *tqparentTQTag = 0L;
TQTag *parentTQTag = 0L;
if (node->tqparent)
tqparentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
parentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
TQString qTagName = node->tag->dtd()->caseSensitive ? node->tag->name : node->tag->name.upper();
int line, col;
node->tag->beginPos(line, col);
if (tqparentTQTag && !tqparentTQTag->childTags.tqcontains(qTagName) &&
!tqparentTQTag->childTags.isEmpty())
if (parentTQTag && !parentTQTag->childTags.tqcontains(qTagName) &&
!parentTQTag->childTags.isEmpty())
{
node->tag->write()->setErrorMark(line);
TQString tqparentTagName = node->tag->dtd()->caseSensitive ? node->tqparent->tag->name : node->tqparent->tag->name.upper();
tqparentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").tqarg(line + 1).tqarg(qTagName).tqarg(tqparentTagName));
TQString parentTagName = node->tag->dtd()->caseSensitive ? node->tqparent->tag->name : node->tqparent->tag->name.upper();
parentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").tqarg(line + 1).tqarg(qTagName).tqarg(parentTagName));
}
TQString nextTagName;
if (node->next)
{
nextTagName = node->tag->dtd()->caseSensitive ? node->next->tag->name : node->next->tag->name.upper();
}
tqparentTQTag = QuantaCommon::tagFromDTD(node);
if (tqparentTQTag && !tqparentTQTag->isSingle() &&
!tqparentTQTag->isOptional() &&
parentTQTag = QuantaCommon::tagFromDTD(node);
if (parentTQTag && !parentTQTag->isSingle() &&
!parentTQTag->isOptional() &&
(!node->next || ( !node->getClosingNode())) )
{
node->tag->write()->setErrorMark(line);
tqparentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName));
parentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName));
} else
if (!tqparentTQTag && node->tag->name.upper() != "!DOCTYPE")
if (!parentTQTag && node->tag->name.upper() != "!DOCTYPE")
{
node->tag->write()->setErrorMark(line);
tqparentTree->showMessage(i18n("Line %1, column %2: %3 is not part of %4.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName).tqarg(node->tag->dtd()->nickName));
parentTree->showMessage(i18n("Line %1, column %2: %3 is not part of %4.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName).tqarg(node->tag->dtd()->nickName));
}
}
break;
@ -182,7 +182,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQStri
if (!node->prev || qTagName != "/" + qPrevTagName)
{
node->tag->write()->setErrorMark(line);
tqparentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName));
parentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName));
}
}
title = tag->tagStr().left(70).stripWhiteSpace();
@ -207,7 +207,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, TQString a_title )
node = 0L;
hasOpenFileMenu = false;
groupTag = 0L;
tqparentTree = tqparent->tqparentTree;
parentTree = tqparent->parentTree;
}

2
quanta/treeviews/structtreetag.h
Unescape View File

@ -39,7 +39,7 @@ public:
bool hasOpenFileMenu;
Tag* groupTag;
TQRegExp fileNameRx;
StructTreeView *tqparentTree;
StructTreeView *parentTree;
};
#endif

38
quanta/treeviews/structtreeview.cpp
Unescape View File

@ -159,7 +159,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly)
Node *currentNode = baseNode;
StructTreeTag *currentItem = top; //after this
StructTreeTag *item = 0L;
StructTreeTag *tqparentItem = top; //under this
StructTreeTag *parentItem = top; //under this
int level = 0;
TQString title;
TQString tagStr;
@ -219,7 +219,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly)
if (!groupOnly)
{
title = "";
item = new StructTreeTag(tqparentItem, currentNode, title, currentItem);
item = new StructTreeTag(parentItem, currentNode, title, currentItem);
item->setOpen(level < openLevel);
currentNode->mainListItem = item;
@ -264,7 +264,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly)
if (currentNode->child)
{
currentNode = currentNode->child;
tqparentItem = item;
parentItem = item;
currentItem = 0L;
level++;
} else
@ -280,7 +280,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly)
while (currentNode)
{
level--;
//tqparentItem = dynamic_cast<StructTreeTag*>(tqparentItem->tqparent());
//parentItem = dynamic_cast<StructTreeTag*>(parentItem->tqparent());
if (currentNode->tqparent && currentNode->tqparent->next)
{
currentNode = currentNode->tqparent->next;
@ -296,15 +296,15 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly)
currentItem = static_cast<StructTreeTag*>(currentNode->prev->mainListItem);
if (currentNode->tqparent)
{
tqparentItem = static_cast<StructTreeTag*>(currentNode->tqparent->mainListItem);
if (!tqparentItem)
parentItem = static_cast<StructTreeTag*>(currentNode->tqparent->mainListItem);
if (!parentItem)
{
tqparentItem = top;
parentItem = top;
}
}
else
{
tqparentItem = top;
parentItem = top;
}
}
@ -877,9 +877,9 @@ void StructTreeView::contentsMousePressEvent(TQMouseEvent* e)
void StructTreeView::copySelectedItems(TQListViewItem* tqparent, TQListViewItem* after)
{
StructTreeTag* tqparent_item = dynamic_cast<StructTreeTag*> (tqparent);
StructTreeTag* parent_item = dynamic_cast<StructTreeTag*> (tqparent);
StructTreeTag* after_item = dynamic_cast<StructTreeTag*> (after);
if(!tqparent_item/* || !after_item*/) // can happen if the element is inserted as the first child
if(!parent_item/* || !after_item*/) // can happen if the element is inserted as the first child
return;
TQPtrList<TQListViewItem> selected_items = selectedItems(false);
@ -896,28 +896,28 @@ void StructTreeView::copySelectedItems(TQListViewItem* tqparent, TQListViewItem*
else
start_node_subtree = kafkaCommon::getNodeSubtree(start_node, 0, end_node, end_node->tag->tagStr().length());
Node* tqparent_node = tqparent_item->node;
if(!tqparent_node)
Node* parent_node = parent_item->node;
if(!parent_node)
return;
Node* next_node = 0;
if(after_item)
next_node = after_item->node->SNext();
else
next_node = tqparent_node->firstChild();
next_node = parent_node->firstChild();
NodeSelection cursor_holder;
NodeModifsSet *modifs = new NodeModifsSet();
kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, tqparent_node, next_node, cursor_holder, modifs);
kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, parent_node, next_node, cursor_holder, modifs);
write->docUndoRedo->addNewModifsSet(modifs, undoRedo::NodeTreeModif, 0, false);
}
void StructTreeView::moveSelectedItems(TQListViewItem* tqparent, TQListViewItem* after)
{
StructTreeTag* tqparent_item = dynamic_cast<StructTreeTag*> (tqparent);
StructTreeTag* parent_item = dynamic_cast<StructTreeTag*> (tqparent);
StructTreeTag* after_item = dynamic_cast<StructTreeTag*> (after);
if(!tqparent_item || !after_item)
if(!parent_item || !after_item)
return;
TQPtrList<TQListViewItem> selected_items = selectedItems(false);
@ -939,14 +939,14 @@ void StructTreeView::moveSelectedItems(TQListViewItem* tqparent, TQListViewItem*
start_node_subtree = kafkaCommon::DTDExtractNodeSubtree(start_node, 0, end_node, end_node->tag->tagStr().length(),
&cursor_node, cursor_offset, modifs);
Node* tqparent_node = tqparent_item->node;
if(!tqparent_node)
Node* parent_node = parent_item->node;
if(!parent_node)
return;
Node* next_node = after_item->node->SNext();
NodeSelection cursor_holder(cursor_node, cursor_offset);
kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, tqparent_node, next_node, cursor_holder, modifs);
kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, parent_node, next_node, cursor_holder, modifs);
write->docUndoRedo->addNewModifsSet(modifs, undoRedo::NodeTreeModif, &cursor_holder, false);
}

2
quanta/treeviews/tagattributetree.cpp
Unescape View File

@ -333,7 +333,7 @@ void TagAttributeTree::setCurrentNode(Node *node)
for (uint i = 0; i < qTag->commonGroups.count(); i++)
{
group = new TopLevelItem(this, group, i18n(qTag->commonGroups[i].utf8()));
AttributeList *groupAttrs = qTag->tqparentDTD->commonAttrs->tqfind(qTag->commonGroups[i]);
AttributeList *groupAttrs = qTag->parentDTD->commonAttrs->tqfind(qTag->commonGroups[i]);
for (uint j = 0; j < groupAttrs->count(); j++)
{
Attribute *attr = groupAttrs->at(j);

8
quanta/treeviews/templatedirform.ui
Unescape View File

@ -57,7 +57,7 @@
</widget>
<widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>tqparentAttr</cstring>
<cstring>parentAttr</cstring>
</property>
<property name="text">
<string>&amp;Inherit tqparent attribute</string>
@ -147,7 +147,7 @@
</widget>
<connections>
<connection>
<sender>tqparentAttr</sender>
<sender>parentAttr</sender>
<signal>toggled(bool)</signal>
<receiver>typesCombo</receiver>
<slot>setDisabled(bool)</slot>
@ -156,14 +156,14 @@
<tabstops>
<tabstop>dirName</tabstop>
<tabstop>typesCombo</tabstop>
<tabstop>tqparentAttr</tabstop>
<tabstop>parentAttr</tabstop>
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<Q_SLOTS>
<slot>okBtn_clicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
</includehints>

14
quanta/treeviews/templatestreeview.cpp
Unescape View File

@ -383,10 +383,10 @@ void TemplatesTreeView::slotNewDir()
if (m_dirInfo.mimeType.isEmpty())
{
createDirDlg->tqparentAttr->setText(i18n("&Inherit tqparent attribute (nothing)"));
createDirDlg->parentAttr->setText(i18n("&Inherit tqparent attribute (nothing)"));
} else
{
createDirDlg->tqparentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_dirInfo.mimeType]));
createDirDlg->parentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_dirInfo.mimeType]));
}
if (createDirDlg->exec())
{
@ -407,7 +407,7 @@ void TemplatesTreeView::slotNewDir()
Maybe you do not have permission to write in the %1 folder.").tqarg(startDir));
return;
}
if (! createDirDlg->tqparentAttr->isChecked())
if (! createDirDlg->parentAttr->isChecked())
{
m_dirInfo.mimeType = i18nToType[createDirDlg->typesCombo->currentText()];
m_dirInfo.preText = "";
@ -612,14 +612,14 @@ void TemplatesTreeView::slotProperties()
m_parentDirInfo = readDirInfo(dotFileInfo.dirPath());
if (!dotFileInfo.exists() || m_dirInfo.mimeType == m_parentDirInfo.mimeType)
{
m_quantaProperties->tqparentAttr->setChecked(true);
m_quantaProperties->parentAttr->setChecked(true);
}
if (m_parentDirInfo.mimeType.isEmpty())
{
m_quantaProperties->tqparentAttr->setText(i18n("&Inherit tqparent attribute (nothing)"));
m_quantaProperties->parentAttr->setText(i18n("&Inherit tqparent attribute (nothing)"));
} else
{
m_quantaProperties->tqparentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_parentDirInfo.mimeType]));
m_quantaProperties->parentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_parentDirInfo.mimeType]));
}
m_quantaProperties->preTextEdit->setText(m_dirInfo.preText);
m_quantaProperties->postTextEdit->setText(m_dirInfo.postText);
@ -681,7 +681,7 @@ void TemplatesTreeView::slotPropertiesApplied()
DirInfo m_localDirInfo;
TQString typeString = "";
if (!m_quantaProperties->tqparentAttr->isChecked())
if (!m_quantaProperties->parentAttr->isChecked())
{
m_localDirInfo.mimeType = m_quantaProperties->typesCombo->currentText();
typeString = m_localDirInfo.mimeType;

4
quanta/treeviews/uploadtreefile.cpp
Unescape View File

@ -32,7 +32,7 @@ UploadTreeFile::UploadTreeFile( UploadTreeFolder *tqparent, const KURL &a_url, c
{
m_url = a_url;
isDir = false;
tqparentFolder = tqparent;
parentFolder = tqparent;
m_fileItem = new KFileItem(a_fileItem);
m_confirm = false;
@ -45,7 +45,7 @@ UploadTreeFile::UploadTreeFile( TQListView *tqparent, const KURL &a_url, const K
{
m_url = a_url;
isDir = false;
tqparentFolder = 0L;
parentFolder = 0L;
m_fileItem = new KFileItem(a_fileItem);
m_confirm = false;

2
quanta/treeviews/uploadtreefile.h
Unescape View File

@ -43,7 +43,7 @@ public:
bool confirmUpload() {return m_confirm;}
public:
UploadTreeFolder * tqparentFolder;
UploadTreeFolder * parentFolder;
KURL m_url;
bool isDir;
bool m_confirm;

8
quanta/treeviews/uploadtreefolder.cpp
Unescape View File

@ -30,7 +30,7 @@
UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * tqparent, const char * name )
: KListViewItem( tqparent, name, "", "", "" )
{
tqparentFolder = tqparent;
parentFolder = tqparent;
m_url = a_url;
m_url.adjustPath(1);
@ -43,7 +43,7 @@ UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * tqparen
UploadTreeFolder::UploadTreeFolder(const KURL &a_url, TQListView * tqparent, const char * name )
: KListViewItem( tqparent, name, "", "", "" )
{
tqparentFolder = 0L;
parentFolder = 0L;
m_url = a_url;
m_url.adjustPath(1);
@ -64,9 +64,9 @@ TQString UploadTreeFolder::fullName()
{
TQString s="";
if ( tqparentFolder )
if ( parentFolder )
{
s = tqparentFolder->fullName();
s = parentFolder->fullName();
s += m_url.fileName()+"/";
}
else {

2
quanta/treeviews/uploadtreefolder.h
Unescape View File

@ -46,7 +46,7 @@ public:
void setWhichPixmap(const TQString& pixmap );
public:
UploadTreeFolder * tqparentFolder;
UploadTreeFolder * parentFolder;
KURL m_url;
public slots: // Public slots

12
quanta/treeviews/uploadtreeview.cpp
Unescape View File

@ -52,7 +52,7 @@ UploadTreeView::~UploadTreeView()
int UploadTreeView::checkboxTree( TQListViewItem *it )
{
tqparentWidget()->setCursor(KCursor::workingCursor());
parentWidget()->setCursor(KCursor::workingCursor());
TQListViewItem *itIter = it ? it->firstChild() : firstChild();
@ -127,7 +127,7 @@ int UploadTreeView::checkboxTree( TQListViewItem *it )
}
}
tqparentWidget()->setCursor(KCursor::arrowCursor());
parentWidget()->setCursor(KCursor::arrowCursor());
return retVal;
}
@ -177,7 +177,7 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it )
itF->setSelected( true );
}
itF = itF->tqparentFolder;
itF = itF->parentFolder;
}
else
{
@ -191,10 +191,10 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it )
itFile->setWhichPixmap("check_clear");
itFile->setSelected(false);
}
itF = itFile->tqparentFolder;
itF = itFile->parentFolder;
}
//iterate through the item's tqparents and set the correct checkboxes for them
//iterate through the item's parents and set the correct checkboxes for them
while (itF)
{
bool hasSelected = false;
@ -227,7 +227,7 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it )
itF->setWhichPixmap( "check_clear" );
itF->setSelected( false );
}
itF = itF->tqparentFolder;
itF = itF->parentFolder;
}
}

34
quanta/utility/newstuff.cpp
Unescape View File

@ -50,13 +50,13 @@ void QNewDTEPStuff::installResource()
} else
ok = false;
if (!ok)
KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded DTEP tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("DTEP Installation Error"));
KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded DTEP tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("DTEP Installation Error"));
}
QNewToolbarStuff::QNewToolbarStuff(const TQString &type, TQWidget *tqparentWidget)
:KNewStuffSecure(type, tqparentWidget)
QNewToolbarStuff::QNewToolbarStuff(const TQString &type, TQWidget *parentWidget)
:KNewStuffSecure(type, parentWidget)
{
connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), tqparentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&)));
connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), parentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&)));
}
@ -64,26 +64,26 @@ void QNewToolbarStuff::installResource()
{
KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "toolbars/" + TQFileInfo(m_tarName).fileName());
bool ok = true;
if (QuantaCommon::checkOverwrite(destURL, tqparentWidget()))
if (QuantaCommon::checkOverwrite(destURL, parentWidget()))
{
if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, tqparentWidget()))
if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, parentWidget()))
ok = false;
else
{
if (KMessageBox::questionYesNo(tqparentWidget(), i18n("Do you want to load the newly downloaded toolbar?"), i18n("Load Toolbar"), i18n("Load"), KStdGuiItem::cancel()) == KMessageBox::Yes)
if (KMessageBox::questionYesNo(parentWidget(), i18n("Do you want to load the newly downloaded toolbar?"), i18n("Load Toolbar"), i18n("Load"), KStdGuiItem::cancel()) == KMessageBox::Yes)
{
emit loadToolbarFile(destURL);
}
}
if (!ok)
KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded toolbar tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Toolbar Installation Error"));
KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded toolbar tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Toolbar Installation Error"));
}
}
QNewTemplateStuff::QNewTemplateStuff(const TQString &type, TQWidget *tqparentWidget)
:KNewStuffSecure(type, tqparentWidget)
QNewTemplateStuff::QNewTemplateStuff(const TQString &type, TQWidget *parentWidget)
:KNewStuffSecure(type, parentWidget)
{
connect(this, TQT_SIGNAL(openFile(const KURL&)), tqparentWidget, TQT_SLOT(slotFileOpen(const KURL&)));
connect(this, TQT_SIGNAL(openFile(const KURL&)), parentWidget, TQT_SLOT(slotFileOpen(const KURL&)));
}
@ -91,19 +91,19 @@ void QNewTemplateStuff::installResource()
{
KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "templates/" + TQFileInfo(m_tarName).fileName());
bool ok = true;
if (QuantaCommon::checkOverwrite(destURL, tqparentWidget()))
if (QuantaCommon::checkOverwrite(destURL, parentWidget()))
{
if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, tqparentWidget()))
if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, parentWidget()))
ok = false;
else
{
if (KMessageBox::questionYesNo(tqparentWidget(), i18n("Do you want to open the newly downloaded template?"), i18n("Open Template"), KStdGuiItem::open(), KStdGuiItem::cancel()) == KMessageBox::Yes)
if (KMessageBox::questionYesNo(parentWidget(), i18n("Do you want to open the newly downloaded template?"), i18n("Open Template"), KStdGuiItem::open(), KStdGuiItem::cancel()) == KMessageBox::Yes)
{
emit openFile(destURL);
}
}
if (!ok)
KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded template file."), i18n("Template Installation Error"));
KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded template file."), i18n("Template Installation Error"));
}
}
@ -121,7 +121,7 @@ void QNewScriptStuff::installResource()
ok = false;
if (!ok)
KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Script Installation Error"));
KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Script Installation Error"));
}
void QNewDocStuff::installResource()
@ -138,7 +138,7 @@ void QNewDocStuff::installResource()
ok = false;
if (!ok)
KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Documentation Installation Error"));
KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Documentation Installation Error"));
}
#include "newstuff.moc"

16
quanta/utility/newstuff.h
Unescape View File

@ -35,8 +35,8 @@ class QNewDTEPStuff: public KNewStuffSecure
TQ_OBJECT
public:
QNewDTEPStuff(const TQString &type, TQWidget *tqparentWidget=0)
:KNewStuffSecure(type, tqparentWidget){};
QNewDTEPStuff(const TQString &type, TQWidget *parentWidget=0)
:KNewStuffSecure(type, parentWidget){};
~QNewDTEPStuff() {};
private:
@ -54,7 +54,7 @@ class QNewToolbarStuff: public KNewStuffSecure
TQ_OBJECT
public:
QNewToolbarStuff(const TQString &type, TQWidget *tqparentWidget=0);
QNewToolbarStuff(const TQString &type, TQWidget *parentWidget=0);
~QNewToolbarStuff() {};
signals:
@ -75,7 +75,7 @@ class QNewTemplateStuff: public KNewStuffSecure
TQ_OBJECT
public:
QNewTemplateStuff(const TQString &type, TQWidget *tqparentWidget=0);
QNewTemplateStuff(const TQString &type, TQWidget *parentWidget=0);
~QNewTemplateStuff() {};
signals:
@ -96,8 +96,8 @@ class QNewScriptStuff: public KNewStuffSecure
TQ_OBJECT
public:
QNewScriptStuff(const TQString &type, TQWidget *tqparentWidget=0)
:KNewStuffSecure(type, tqparentWidget){};
QNewScriptStuff(const TQString &type, TQWidget *parentWidget=0)
:KNewStuffSecure(type, parentWidget){};
~QNewScriptStuff() {};
private:
@ -115,8 +115,8 @@ class QNewDocStuff: public KNewStuffSecure
TQ_OBJECT
public:
QNewDocStuff(const TQString &type, TQWidget *tqparentWidget=0)
:KNewStuffSecure(type, tqparentWidget){};
QNewDocStuff(const TQString &type, TQWidget *parentWidget=0)
:KNewStuffSecure(type, parentWidget){};
~QNewDocStuff() {};
private:

14
quanta/utility/tagaction.cpp
Unescape View File

@ -72,14 +72,14 @@ int MyProcess::commSetupDoneC()
return KProcess::commSetupDoneC();
}
TagAction::TagAction( TQDomElement *element, KMainWindow *tqparentMainWindow, bool toggle)
TagAction::TagAction( TQDomElement *element, KMainWindow *parentMainWindow, bool toggle)
: KToggleAction(element->attribute("text").isEmpty() ? TQString("") : i18n(element->attribute("text").utf8()),
KShortcut(element->attribute("shortcut")), 0, 0, tqparentMainWindow->actionCollection(), element->attribute("name").ascii()),
KShortcut(element->attribute("shortcut")), 0, 0, parentMainWindow->actionCollection(), element->attribute("name").ascii()),
//disable toggle now m_toggle(toggle)
m_toggle(false)
{
setToolTip(element->attribute("tooltip"));
m_parentMainWindow = tqparentMainWindow;
m_parentMainWindow = parentMainWindow;
m_modified = false;
m_useInputFile = false;
m_useOutputFile = false;
@ -1066,7 +1066,7 @@ void TagAction::applyTagInSelection(Node* start_node, int start_offset, Node* en
if (!nodeTQTag) return;
bool specialTagInsertion = false;
TQPtrList<TQTag> qTagList = nodeTQTag->tqparents();
TQPtrList<TQTag> qTagList = nodeTQTag->parents();
TQTag* qTag = 0;
for (qTag = qTagList.first(); qTag; qTag = qTagList.next())
{
@ -1248,15 +1248,15 @@ void TagAction::deapplyTagInSelection(Node* start_node, int start_offset, Node*
Node* common_parent_start_child = kafkaCommon::getCommonParentChild(start_node, tag_parent);
Node* common_parent_end_child = kafkaCommon::getCommonParentChild(end_node, tag_parent);
Node* tqparent_of_tag_parent = tag_parent->tqparent;
Node* parent_of_tag_parent = tag_parent->tqparent;
if(common_parent_end_child == common_parent_start_child)
common_parent_end_child = 0;
if(!common_parent_start_child)
common_parent_start_child = kafkaCommon::getCommonParentChild(start_node, commonParent);
kafkaCommon::moveNode(common_parent_start_child, tqparent_of_tag_parent, tag_parent, selection, modifs, true, true);
kafkaCommon::moveNode(common_parent_start_child, parent_of_tag_parent, tag_parent, selection, modifs, true, true);
if(common_parent_end_child)
kafkaCommon::moveNode(common_parent_end_child, tqparent_of_tag_parent, tag_parent, selection, modifs, true, true);
kafkaCommon::moveNode(common_parent_end_child, parent_of_tag_parent, tag_parent, selection, modifs, true, true);
// Remove tag_parent node subtree if empty
if(!tag_parent->hasChildNodes())

2
quanta/utility/tagaction.h
Unescape View File

@ -55,7 +55,7 @@ public:
* @param toggle If set to true, the class behaves like a KToggleAction;
* Else it behaves like a KAction. This avoids the multi-inheritance problem.
*/
TagAction(TQDomElement *element, KMainWindow *tqparentMainWindow, bool toggle = false);
TagAction(TQDomElement *element, KMainWindow *parentMainWindow, bool toggle = false);
virtual ~TagAction();
TQDomElement data() const { return tag; }

48
quanta/utility/tagactionset.cpp
Unescape View File

@ -47,7 +47,7 @@ TagActionSetAbstract::TagActionSetAbstract(TQObject *tqparent, const char *name)
TagActionSetAbstract::~TagActionSetAbstract()
{}
Node* TagActionSetAbstract::tqparentTag(Node* node, TQString const& tagName)
Node* TagActionSetAbstract::parentTag(Node* node, TQString const& tagName)
{
Q_ASSERT(node);
@ -221,14 +221,14 @@ bool TagActionSet::isInDivArea() const
{
Q_ASSERT(m_currentNode);
return tqparentTag(m_currentNode, "div");
return parentTag(m_currentNode, "div");
}
void TagActionSet::slotCopyDivElement()
{
Q_ASSERT(m_currentNode);
Node* divNode = tqparentTag(m_currentNode, "div");
Node* divNode = parentTag(m_currentNode, "div");
Q_ASSERT(divNode);
Node* divClosingNode = divNode->getClosingNode();
@ -245,7 +245,7 @@ void TagActionSet::slotCutDivElement()
{
Q_ASSERT(m_currentNode);
Node* divNode = tqparentTag(m_currentNode, "div");
Node* divNode = parentTag(m_currentNode, "div");
Q_ASSERT(divNode);
Node* divClosingNode = divNode->getClosingNode();
@ -274,7 +274,7 @@ TableTagActionSet::TableTagActionSet(TQObject *tqparent, const char *name)
bool TableTagActionSet::isInTagContext() const
{
return tqparentTag(m_currentNode, "table");
return parentTag(m_currentNode, "table");
}
void TableTagActionSet::initActionMenus(TQWidget* widget)
@ -575,14 +575,14 @@ void TableTagActionSet::slotInsertTable()
bool TableTagActionSet::canInsertRowAbove() const
{
return isInTagContext() && tqparentTag(m_currentNode, "tbody");
return isInTagContext() && parentTag(m_currentNode, "tbody");
}
void TableTagActionSet::slotInsertRowAbove()
{
Q_ASSERT(m_currentNode);
Node* nearRow = tqparentTag(m_currentNode, "tr");
Node* nearRow = parentTag(m_currentNode, "tr");
if(!nearRow)
return;
@ -610,11 +610,11 @@ void TableTagActionSet::slotInsertRowBelow()
Q_ASSERT(m_currentNode);
Node* nearRow = 0;
Node* aux = tqparentTag(m_currentNode, "thead");
Node* aux = parentTag(m_currentNode, "thead");
if(aux)
nearRow= firstChildTag(tableStart(), "tr");
else
nearRow = tqparentTag(m_currentNode, "tr");
nearRow = parentTag(m_currentNode, "tr");
if(!nearRow)
return;
@ -781,7 +781,7 @@ void TableTagActionSet::slotRemoveRows()
if(!selection.hasSelection())
{
Node* nearTr = tqparentTag(m_currentNode, "tr");
Node* nearTr = parentTag(m_currentNode, "tr");
kafkaCommon::extractAndDeleteNode(nearTr, modifs, true, true);
}
else
@ -789,8 +789,8 @@ void TableTagActionSet::slotRemoveRows()
Node* startSelection = kafkaCommon::getNodeFromLocation(selection.cursorNode());
Node* endSelection = kafkaCommon::getNodeFromLocation(selection.cursorNodeEndSel());
Node* startTr = tqparentTag(startSelection, "tr");
Node* endTr = tqparentTag(endSelection, "tr");
Node* startTr = parentTag(startSelection, "tr");
Node* endTr = parentTag(endSelection, "tr");
Node* iteratorNode = startTr;
bool loop(true);
@ -844,7 +844,7 @@ void TableTagActionSet::slotRemoveColumns()
if(startColumnIndex == -1 || endColumnIndex == -1)
return;
m_currentNode = tqparentTag(m_currentNode, "tbody"); // m_currentNode will become invalid
m_currentNode = parentTag(m_currentNode, "tbody"); // m_currentNode will become invalid
for(int i = 0; i != numberOfColumnsSelected; ++i)
removeColumn(startColumnIndex, modifs);
}
@ -880,9 +880,9 @@ void TableTagActionSet::slotRemoveCellsContent()
if(!selection.hasSelection())
{
Node* aux = m_currentNode;
m_currentNode = tqparentTag(m_currentNode, "tbody");
m_currentNode = parentTag(m_currentNode, "tbody");
Node* nearTd = tqparentTag(aux, "td");
Node* nearTd = parentTag(aux, "td");
clearCellContents(nearTd, modifs);
}
else
@ -890,8 +890,8 @@ void TableTagActionSet::slotRemoveCellsContent()
Node* startSelection = kafkaCommon::getNodeFromLocation(selection.cursorNode());
Node* endSelection = kafkaCommon::getNodeFromLocation(selection.cursorNodeEndSel());
Node* startTd = tqparentTag(startSelection, "td");
Node* endTd = tqparentTag(endSelection, "td");
Node* startTd = parentTag(startSelection, "td");
Node* endTd = parentTag(endSelection, "td");
if(!startTd || !endTd)
return;
@ -933,8 +933,8 @@ void TableTagActionSet::slotMergeSelectedCells()
Node* startSelection = kafkaCommon::getNodeFromLocation(selection.cursorNode());
Node* endSelection = kafkaCommon::getNodeFromLocation(selection.cursorNodeEndSel());
Node* startTd = tqparentTag(startSelection, "td");
Node* endTd = tqparentTag(endSelection, "td");
Node* startTd = parentTag(startSelection, "td");
Node* endTd = parentTag(endSelection, "td");
Node* nodeIterator = startTd->SNext();
Node* stopNode = endTd->SNext();
@ -975,7 +975,7 @@ Node* TableTagActionSet::tableStart() const
Q_ASSERT(isInTagContext());
Q_ASSERT(m_currentNode);
return tqparentTag(m_currentNode, "table");
return parentTag(m_currentNode, "table");
}
int TableTagActionSet::numberOfColumns() const
@ -1004,7 +1004,7 @@ int TableTagActionSet::numberOfColumns() const
int TableTagActionSet::currentColumnIndex() const
{
return columnIndex(m_currentNode);
/* Node* nearTd = tqparentTag(m_currentNode, "td");
/* Node* nearTd = parentTag(m_currentNode, "td");
if(!nearTd)
return -1;
@ -1012,7 +1012,7 @@ int TableTagActionSet::currentColumnIndex() const
if(!_tableStart)
return -1;
Node* firstTd = firstChildTag(tqparentTag(m_currentNode, "tr"), "td");
Node* firstTd = firstChildTag(parentTag(m_currentNode, "tr"), "td");
//Node* firstTd = firstChildTag(_tableStart, "td");
if(!firstTd)
return -1;
@ -1032,7 +1032,7 @@ int TableTagActionSet::currentColumnIndex() const
int TableTagActionSet::columnIndex(Node* node) const
{
Node* nearTd = tqparentTag(node, "td");
Node* nearTd = parentTag(node, "td");
if(!nearTd)
return -1;
@ -1040,7 +1040,7 @@ int TableTagActionSet::columnIndex(Node* node) const
if(!_tableStart)
return -1;
Node* firstTd = firstChildTag(tqparentTag(node, "tr"), "td");
Node* firstTd = firstChildTag(parentTag(node, "tr"), "td");
if(!firstTd)
return -1;

2
quanta/utility/tagactionset.h
Unescape View File

@ -45,7 +45,7 @@ public:
DOM::Node const& currentDomNode() const {return m_currentDomNode;}
static Node* tqparentTag(Node* node, TQString const& tagName);
static Node* parentTag(Node* node, TQString const& tagName);
static Node* firstChildTag(Node* node, TQString const& tagName);
virtual bool isInTagContext(/*DOM::Node const& node*/) const = 0;

18
quanta/utility/toolbartabwidget.cpp
Unescape View File

@ -65,9 +65,9 @@ ToolbarTabWidget::ToolbarTabWidget(TQWidget * tqparent, const char * name, WFlag
void ToolbarTabWidget::insertTab(TQWidget *child, const TQString &label, const TQString &id)
{
if (child->inherits("KToolBar") && child->tqparentWidget())
if (child->inherits("KToolBar") && child->parentWidget())
{
TQTabWidget::insertTab(child->tqparentWidget(), label);
TQTabWidget::insertTab(child->parentWidget(), label);
toolbarList.insert(id, child);
}
}
@ -78,7 +78,7 @@ TQWidget* ToolbarTabWidget::page(int index)
for (TQMap<TQString, TQWidget*>::Iterator it = toolbarList.begin(); it != toolbarList.end(); ++it)
{
if (it.data()->tqparentWidget() == w)
if (it.data()->parentWidget() == w)
{
w = *it;
break;
@ -92,7 +92,7 @@ TQString ToolbarTabWidget::id(TQWidget *w) const
TQString idStr;
for (TQMap<TQString, TQWidget*>::ConstIterator it = toolbarList.constBegin(); it != toolbarList.constEnd(); ++it)
{
if (it.data()->tqparentWidget() == w)
if (it.data()->parentWidget() == w)
{
idStr = it.key();
break;
@ -107,7 +107,7 @@ TQString ToolbarTabWidget::id(int index) const
TQString idStr;
for (TQMap<TQString, TQWidget*>::ConstIterator it = toolbarList.constBegin(); it != toolbarList.constEnd(); ++it)
{
if (it.data()->tqparentWidget() == w)
if (it.data()->parentWidget() == w)
{
idStr = it.key();
break;
@ -124,7 +124,7 @@ TQWidget* ToolbarTabWidget::page(const TQString& id)
void ToolbarTabWidget::removePage(TQWidget * w)
{
TQWidget *tqparent = w->tqparentWidget();
TQWidget *tqparent = w->parentWidget();
if (w->inherits("KToolBar") && tqparent)
{
TQTabWidget::removePage(tqparent);
@ -179,7 +179,7 @@ void ToolbarTabWidget::mousePressEvent ( TQMouseEvent * e )
pageW = currentPage();
for (TQMap<TQString, TQWidget*>::Iterator it = toolbarList.begin(); it != toolbarList.end(); ++it)
{
if (it.data()->tqparentWidget() == pageW)
if (it.data()->parentWidget() == pageW)
{
tabUnderMouse = it.key();
break;
@ -227,7 +227,7 @@ QuantaToolBar::QuantaToolBar(TQWidget *tqparent, const char *name, bool honor_st
:KToolBar (tqparent, name=0, honor_style, readConfig)
{
m_popupMenu = new KPopupMenu(this);
m_toolbarTab = dynamic_cast<ToolbarTabWidget*>(tqparent->tqparentWidget());
m_toolbarTab = dynamic_cast<ToolbarTabWidget*>(tqparent->parentWidget());
currentActionName = "";
m_iconTextMenu = new KPopupMenu(this);
m_iconTextMenu->setCheckable(true);
@ -311,7 +311,7 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e)
for (uint i = 0; i < tqchildrenList->count(); i++)
{
KToolBarButton *w = static_cast<KToolBarButton*>(TQT_TQWIDGET(tqchildrenList->at(i)));
TQPoint p1 = w->tqparentWidget()->mapToGlobal(w->pos());
TQPoint p1 = w->parentWidget()->mapToGlobal(w->pos());
TQPoint p2 = TQPoint(p1.x() + w->width(), p1.y()+w->height());
if (TQRect(p1, p2).tqcontains(p))
{

Write Preview
Loading…
Cancel
Save