diff options
Diffstat (limited to 'quanta/treeviews')
36 files changed, 212 insertions, 212 deletions
diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index 7145ab69..baf6bbe5 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -70,7 +70,7 @@ class BaseTreeViewToolTip : public TQToolTip { public: - BaseTreeViewToolTip( TQWidget *tqparent, BaseTreeView *lv ); + BaseTreeViewToolTip( TQWidget *parent, BaseTreeView *lv ); void maybeTip( const TQPoint &pos ); @@ -79,8 +79,8 @@ private: }; -BaseTreeViewToolTip::BaseTreeViewToolTip( TQWidget *tqparent, BaseTreeView *lv ) - : TQToolTip( tqparent ), m_view( lv ) +BaseTreeViewToolTip::BaseTreeViewToolTip( TQWidget *parent, BaseTreeView *lv ) + : TQToolTip( parent ), m_view( lv ) { } @@ -111,8 +111,8 @@ void BaseTreeViewToolTip::maybeTip( const TQPoint &pos ) //BaseTreeViewItem implementation -BaseTreeViewItem::BaseTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ) -: KFileTreeViewItem( tqparent, item, brnch) +BaseTreeViewItem::BaseTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ) +: KFileTreeViewItem( parent, item, brnch) { } @@ -163,11 +163,11 @@ void BaseTreeViewItem::refreshIcon() //BaseTreeBranch implementation -BaseTreeBranch::BaseTreeBranch(KFileTreeView *tqparent, const KURL& url, +BaseTreeBranch::BaseTreeBranch(KFileTreeView *parent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden , KFileTreeViewItem *branchRoot) - : KFileTreeBranch(tqparent, url, name, pix, showHidden, branchRoot) + : KFileTreeBranch(parent, url, name, pix, showHidden, branchRoot) { bool localFile = url.isLocalFile(); setAutoUpdate(localFile); @@ -184,13 +184,13 @@ bool BaseTreeBranch::matchesFilter(const KFileItem *item) const return KFileTreeBranch::matchesFilter(item); } -KFileTreeViewItem* BaseTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparent, +KFileTreeViewItem* BaseTreeBranch::createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem) { BaseTreeViewItem *tvi = 0; - if( tqparent && fileItem) + if( parent && fileItem) { - tvi = new BaseTreeViewItem(tqparent, fileItem, this); + tvi = new BaseTreeViewItem(parent, fileItem, this); // we assume there are childs if (tvi) { @@ -198,7 +198,7 @@ KFileTreeViewItem* BaseTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparen } } else - kdDebug(24000) << "createTreeViewItem: Have no tqparent" << endl; + kdDebug(24000) << "createTreeViewItem: Have no parent" << endl; return tvi; } @@ -230,7 +230,7 @@ void BaseTreeBranch::addOpenFolder(TQStringList* openFolder) } else { - item = dynamic_cast<KFileTreeViewItem *>(item->tqparent()); + item = dynamic_cast<KFileTreeViewItem *>(item->parent()); } } if (item == root()) @@ -276,7 +276,7 @@ void BaseTreeBranch::updateOpenFolder() }; // go up if no sibling available if (! item->nextSibling()) - item = dynamic_cast<KFileTreeViewItem *>(item->tqparent()); + item = dynamic_cast<KFileTreeViewItem *>(item->parent()); if (item == root()) break; if (item) @@ -291,10 +291,10 @@ void BaseTreeBranch::updateOpenFolder() // //////////////////////////////////////////////////////////////////////////////////// -BaseTreeView::BaseTreeView(TQWidget *tqparent, const char *name) -: KFileTreeView(tqparent, name), fileInfoDlg(0), m_saveOpenFolder(false), m_openWithMenu(0L), m_openWithMenuId(-1) +BaseTreeView::BaseTreeView(TQWidget *parent, const char *name) +: KFileTreeView(parent, name), fileInfoDlg(0), m_saveOpenFolder(false), m_openWithMenu(0L), m_openWithMenuId(-1) { - m_parent = tqparent; + m_parent = parent; TQToolTip::remove(viewport()); // remove the tooltip from TQListView m_tooltip = new BaseTreeViewToolTip(viewport(), this); setFrameStyle( Panel | Sunken ); @@ -923,16 +923,16 @@ void BaseTreeView::slotDropped (TQWidget *, TQDropEvent * /*e*/, KURL::List& fil } -void BaseTreeView::findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after) +void BaseTreeView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after) { TQPoint p (contentsToViewport(pos)); TQListViewItem *atpos = itemAt(p); -// if (atpos && atpos->tqparent()) { +// if (atpos && atpos->parent()) { // after = atpos; -// tqparent = atpos->tqparent(); +// parent = atpos->parent(); // } else { after = atpos; - tqparent = atpos; + parent = atpos; // } } diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h index 47dc5158..18ff5ae0 100644 --- a/quanta/treeviews/basetreeview.h +++ b/quanta/treeviews/basetreeview.h @@ -54,7 +54,7 @@ class QuantaPlugin; class BaseTreeViewItem : public KFileTreeViewItem { public: - BaseTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ); + BaseTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ); /** sorts folders separate from files @@ -87,13 +87,13 @@ class BaseTreeBranch : public KFileTreeBranch { TQ_OBJECT public: - BaseTreeBranch(KFileTreeView *tqparent, const KURL& url, + BaseTreeBranch(KFileTreeView *parent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden = false, KFileTreeViewItem *branchRoot = 0); /** get the BaseTreeViewItem */ - virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem *tqparent, + virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem *parent, KFileItem *fileItem ); /** does custom filtering @@ -137,7 +137,7 @@ class BaseTreeView : public KFileTreeView { TQ_OBJECT public: - BaseTreeView(TQWidget *tqparent = 0L, const char *name = 0L); + BaseTreeView(TQWidget *parent = 0L, const char *name = 0L); virtual ~BaseTreeView(); /** @@ -307,7 +307,7 @@ protected: */ bool expandArchiv (KFileTreeViewItem *item); bool acceptDrag(TQDropEvent* e ) const; - void findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after); + void findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after); /** this is for project and template tree to reduce includes there @@ -326,7 +326,7 @@ protected: TQString m_projectName; KURL m_projectBaseURL; FileInfoDlg* fileInfoDlg; - /** the tqparent of the treeview + /** the parent of the treeview the passwords are cached there */ TQWidget * m_parent; diff --git a/quanta/treeviews/docfolder.cpp b/quanta/treeviews/docfolder.cpp index 8ecf9c0f..0a1d941d 100644 --- a/quanta/treeviews/docfolder.cpp +++ b/quanta/treeviews/docfolder.cpp @@ -28,8 +28,8 @@ #include "docfolder.h" #include "docitem.h" -DocFolder::DocFolder(TQListViewItem *tqparent, const TQString &_name, KConfig *config, const TQString &basePath) - : KListViewItem(tqparent) +DocFolder::DocFolder(TQListViewItem *parent, const TQString &_name, KConfig *config, const TQString &basePath) + : KListViewItem(parent) { name = _name; topLevel = false; @@ -59,8 +59,8 @@ DocFolder::DocFolder(TQListViewItem *tqparent, const TQString &_name, KConfig *c } } -DocFolder::DocFolder(TQListView *tqparent, const TQString &_name, KConfig *config, const TQString &basePath) - : KListViewItem(tqparent) +DocFolder::DocFolder(TQListView *parent, const TQString &_name, KConfig *config, const TQString &basePath) + : KListViewItem(parent) { name = _name; topLevel = false; diff --git a/quanta/treeviews/docfolder.h b/quanta/treeviews/docfolder.h index 945fa786..f3c8db87 100644 --- a/quanta/treeviews/docfolder.h +++ b/quanta/treeviews/docfolder.h @@ -33,8 +33,8 @@ class KConfig; class DocFolder : public KListViewItem { public: - DocFolder(TQListViewItem *tqparent, const TQString &_name, KConfig *config, const TQString &basePath); - DocFolder(TQListView *tqparent, const TQString &_name, KConfig *config, const TQString &basePath); + DocFolder(TQListViewItem *parent, const TQString &_name, KConfig *config, const TQString &basePath); + DocFolder(TQListView *parent, const TQString &_name, KConfig *config, const TQString &basePath); ~DocFolder(); TQString text( int column ) const; void setup(); diff --git a/quanta/treeviews/docitem.cpp b/quanta/treeviews/docitem.cpp index 782d6140..f24c3bb9 100644 --- a/quanta/treeviews/docitem.cpp +++ b/quanta/treeviews/docitem.cpp @@ -21,15 +21,15 @@ #include "docitem.h" -DocItem::DocItem(TQListViewItem *tqparent, const TQString &_name, const TQString &_url) - : KListViewItem(tqparent) +DocItem::DocItem(TQListViewItem *parent, const TQString &_name, const TQString &_url) + : KListViewItem(parent) { url = _url; name = _name; } -DocItem::DocItem(TQListView *tqparent, const TQString &_name, const TQString &_url) - : KListViewItem(tqparent) +DocItem::DocItem(TQListView *parent, const TQString &_name, const TQString &_url) + : KListViewItem(parent) { url = _url; name = _name; diff --git a/quanta/treeviews/docitem.h b/quanta/treeviews/docitem.h index 7c261012..59b126a1 100644 --- a/quanta/treeviews/docitem.h +++ b/quanta/treeviews/docitem.h @@ -31,8 +31,8 @@ class KConfig; class DocItem : public KListViewItem { public: - DocItem(TQListViewItem *tqparent, const TQString &_name, const TQString &_url); - DocItem(TQListView *tqparent, const TQString &_name, const TQString &_url); + DocItem(TQListViewItem *parent, const TQString &_name, const TQString &_url); + DocItem(TQListView *parent, const TQString &_name, const TQString &_url); ~DocItem(); TQString text( int column ) const; diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp index 99f1f4bd..dbd7c11a 100644 --- a/quanta/treeviews/doctreeview.cpp +++ b/quanta/treeviews/doctreeview.cpp @@ -35,8 +35,8 @@ #include "docfolder.h" #include "docitem.h" -DocTreeView::DocTreeView(TQWidget *tqparent, const char *name ) - : KListView(tqparent,name) +DocTreeView::DocTreeView(TQWidget *parent, const char *name ) + : KListView(parent,name) { contextHelpDict = new TQDict<TQString>( 101, false ); diff --git a/quanta/treeviews/doctreeview.h b/quanta/treeviews/doctreeview.h index bba36a04..5be36ec5 100644 --- a/quanta/treeviews/doctreeview.h +++ b/quanta/treeviews/doctreeview.h @@ -37,7 +37,7 @@ class DocTreeView : public KListView { Q_OBJECT TQ_OBJECT public: - DocTreeView(TQWidget *tqparent=0, const char *name=0); + DocTreeView(TQWidget *parent=0, const char *name=0); ~DocTreeView(); TQString *contextHelp(const TQString &keyword); diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index 4008d408..bebac21d 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -40,8 +40,8 @@ //FilesTreeView implementation -FilesTreeView::FilesTreeView(KConfig *config, TQWidget *tqparent, const char *name) - : BaseTreeView(tqparent, name) +FilesTreeView::FilesTreeView(KConfig *config, TQWidget *parent, const char *name) + : BaseTreeView(parent, name) { setAcceptDrops(true); setDragEnabled(true); diff --git a/quanta/treeviews/filestreeview.h b/quanta/treeviews/filestreeview.h index dfef213c..29b547f0 100644 --- a/quanta/treeviews/filestreeview.h +++ b/quanta/treeviews/filestreeview.h @@ -36,7 +36,7 @@ class FilesTreeView : public BaseTreeView { TQ_OBJECT public: - FilesTreeView(KConfig *config, TQWidget *tqparent, const char *name = 0L); + FilesTreeView(KConfig *config, TQWidget *parent, const char *name = 0L); virtual ~FilesTreeView(); KURL::List topURLList; TQMap<TQString, TQString> topURLAliases; diff --git a/quanta/treeviews/newtemplatedirdlg.cpp b/quanta/treeviews/newtemplatedirdlg.cpp index cf960923..48fd6b5e 100644 --- a/quanta/treeviews/newtemplatedirdlg.cpp +++ b/quanta/treeviews/newtemplatedirdlg.cpp @@ -17,7 +17,7 @@ #include "newtemplatedirdlg.h" #include "newtemplatedirdlg.moc" -NewTemplateDirDlg::NewTemplateDirDlg(TQWidget *tqparent, const char *name ) : TemplateDirForm(tqparent,name) +NewTemplateDirDlg::NewTemplateDirDlg(TQWidget *parent, const char *name ) : TemplateDirForm(parent,name) { setCaption(name); connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); diff --git a/quanta/treeviews/newtemplatedirdlg.h b/quanta/treeviews/newtemplatedirdlg.h index 56dbba5c..fb496eb8 100644 --- a/quanta/treeviews/newtemplatedirdlg.h +++ b/quanta/treeviews/newtemplatedirdlg.h @@ -27,7 +27,7 @@ class NewTemplateDirDlg : public TemplateDirForm { Q_OBJECT TQ_OBJECT public: - NewTemplateDirDlg(TQWidget *tqparent=0, const char *name=0); + NewTemplateDirDlg(TQWidget *parent=0, const char *name=0); ~NewTemplateDirDlg(); }; diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index 8508b452..8fba1282 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -46,8 +46,8 @@ #endif //ProjectTreeViewItem implementation -ProjectTreeViewItem::ProjectTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ) -: BaseTreeViewItem( tqparent, item, brnch) +ProjectTreeViewItem::ProjectTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ) +: BaseTreeViewItem( parent, item, brnch) { } @@ -70,21 +70,21 @@ void ProjectTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, } //ProjectTreeBranch implementation -ProjectTreeBranch::ProjectTreeBranch(KFileTreeView *tqparent, const KURL& url, +ProjectTreeBranch::ProjectTreeBranch(KFileTreeView *parent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden, KFileTreeViewItem *branchRoot) - : BaseTreeBranch(tqparent, url, name, pix, showHidden, branchRoot) + : BaseTreeBranch(parent, url, name, pix, showHidden, branchRoot) { } -KFileTreeViewItem* ProjectTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparent, +KFileTreeViewItem* ProjectTreeBranch::createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem ) { BaseTreeViewItem *tvi = 0; - if( tqparent && fileItem ) + if( parent && fileItem ) { - tvi = new ProjectTreeViewItem( tqparent, fileItem, this ); + tvi = new ProjectTreeViewItem( parent, fileItem, this ); if (tvi) { // we assume there are childs @@ -95,13 +95,13 @@ KFileTreeViewItem* ProjectTreeBranch::createTreeViewItem(KFileTreeViewItem *tqpa } } else - kdDebug(24000) << "ProjectTreeBranch::createTreeViewItem: Have no tqparent" << endl; + kdDebug(24000) << "ProjectTreeBranch::createTreeViewItem: Have no parent" << endl; return tvi; } //ProjectTreeView implementation -ProjectTreeView::ProjectTreeView(TQWidget *tqparent, const char *name ) - : BaseTreeView(tqparent,name), m_projectFiles(0) +ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) + : BaseTreeView(parent,name), m_projectFiles(0) { //setSelectionModeExt(KListView::Extended); setRootIsDecorated(false); diff --git a/quanta/treeviews/projecttreeview.h b/quanta/treeviews/projecttreeview.h index dafa3a2f..1e290328 100644 --- a/quanta/treeviews/projecttreeview.h +++ b/quanta/treeviews/projecttreeview.h @@ -28,7 +28,7 @@ class ProjectList; class ProjectTreeViewItem : public BaseTreeViewItem { public: - ProjectTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ); + ProjectTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ); /** makes document root italics */ void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align); }; @@ -36,12 +36,12 @@ public: class ProjectTreeBranch : public BaseTreeBranch { public: - ProjectTreeBranch(KFileTreeView *tqparent, const KURL& url, + ProjectTreeBranch(KFileTreeView *parent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden = false, KFileTreeViewItem *branchRoot = 0L); /** check for CVS and visible*/ - virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *tqparent, + virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem ); /** only files in list will be shown */ @@ -61,10 +61,10 @@ public: * the parameters are only used at the first call to create the class * */ - static ProjectTreeView* const ref(TQWidget *tqparent = 0L, const char *name = 0L) + static ProjectTreeView* const ref(TQWidget *parent = 0L, const char *name = 0L) { static ProjectTreeView *m_ref; - if (!m_ref) m_ref = new ProjectTreeView(tqparent, name); + if (!m_ref) m_ref = new ProjectTreeView(parent, name); return m_ref; } @@ -116,7 +116,7 @@ private: * If you need the class use ProjectTreeView::ref() for * construction and reference */ - ProjectTreeView(TQWidget *tqparent, const char *name); + ProjectTreeView(TQWidget *parent, const char *name); ProjectTreeBranch *m_projectDir; KPopupMenu *m_fileMenu; diff --git a/quanta/treeviews/quantapropertiespage.ui b/quanta/treeviews/quantapropertiespage.ui index 97c666b6..109caf2f 100644 --- a/quanta/treeviews/quantapropertiespage.ui +++ b/quanta/treeviews/quantapropertiespage.ui @@ -62,7 +62,7 @@ <cstring>parentAttr</cstring> </property> <property name="text"> - <string>&Inherit type from tqparent (nothing)</string> + <string>&Inherit type from parent (nothing)</string> </property> </widget> <widget class="TQLabel" row="0" column="0"> diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp index 55b36c81..02eda9ce 100644 --- a/quanta/treeviews/scripttreeview.cpp +++ b/quanta/treeviews/scripttreeview.cpp @@ -58,8 +58,8 @@ extern int xmlLoadExtDtdDefaultValue; -ScriptTreeView::ScriptTreeView(TQWidget *tqparent, const char *name ) - : BaseTreeView(tqparent,name) +ScriptTreeView::ScriptTreeView(TQWidget *parent, const char *name ) + : BaseTreeView(parent,name) { setSaveOpenFolder(true); addColumn(i18n("Scripts"), -1); diff --git a/quanta/treeviews/scripttreeview.h b/quanta/treeviews/scripttreeview.h index d5d69ea9..d09cdf60 100644 --- a/quanta/treeviews/scripttreeview.h +++ b/quanta/treeviews/scripttreeview.h @@ -45,7 +45,7 @@ class ScriptTreeView : public BaseTreeView { public: - ScriptTreeView(TQWidget *tqparent, const char *name = 0L); + ScriptTreeView(TQWidget *parent, const char *name = 0L); ~ScriptTreeView(); protected slots: diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp index 22c2407d..1618d588 100644 --- a/quanta/treeviews/servertreeview.cpp +++ b/quanta/treeviews/servertreeview.cpp @@ -36,8 +36,8 @@ #include "qextfileinfo.h" -ServerTreeViewItem::ServerTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ) -: BaseTreeViewItem( tqparent, item, brnch) +ServerTreeViewItem::ServerTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ) +: BaseTreeViewItem( parent, item, brnch) { } @@ -63,22 +63,22 @@ void ServerTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, } //ServerTreeBranch implementation -ServerTreeBranch::ServerTreeBranch(KFileTreeView *tqparent, const KURL& url, +ServerTreeBranch::ServerTreeBranch(KFileTreeView *parent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden, KFileTreeViewItem *branchRoot) - : BaseTreeBranch(tqparent, url, name, pix, showHidden, branchRoot) + : BaseTreeBranch(parent, url, name, pix, showHidden, branchRoot) { } -KFileTreeViewItem* ServerTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparent, KFileItem *fileItem ) +KFileTreeViewItem* ServerTreeBranch::createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem ) { BaseTreeViewItem *tvi = 0; - if( tqparent && fileItem ) + if( parent && fileItem ) { - tvi = new ServerTreeViewItem( tqparent, fileItem, this ); + tvi = new ServerTreeViewItem( parent, fileItem, this ); } else - kdDebug(24000) << "ServerTreeBranch::createTreeViewItem: Have no tqparent" << endl; + kdDebug(24000) << "ServerTreeBranch::createTreeViewItem: Have no parent" << endl; return tvi; } @@ -87,8 +87,8 @@ KFileTreeViewItem* ServerTreeBranch::createTreeViewItem(KFileTreeViewItem *tqpar // ServerTreeView implementation // // -ServerTreeView::ServerTreeView(KConfig *config, TQWidget *tqparent, const KURL &url, const char *name) - : BaseTreeView(tqparent, name) +ServerTreeView::ServerTreeView(KConfig *config, TQWidget *parent, const KURL &url, const char *name) + : BaseTreeView(parent, name) { setAcceptDrops(true); setDragEnabled(true); diff --git a/quanta/treeviews/servertreeview.h b/quanta/treeviews/servertreeview.h index af5c0afa..5c36771b 100644 --- a/quanta/treeviews/servertreeview.h +++ b/quanta/treeviews/servertreeview.h @@ -35,7 +35,7 @@ class ProjectList; class ServerTreeViewItem : public BaseTreeViewItem { public: - ServerTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ); + ServerTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ); /** makes document not in project lighter */ void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align); }; @@ -47,12 +47,12 @@ public: class ServerTreeBranch : public BaseTreeBranch { public: - ServerTreeBranch(KFileTreeView *tqparent, const KURL& url, + ServerTreeBranch(KFileTreeView *parent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden = false, KFileTreeViewItem *branchRoot = 0L); /** check for CVS and visible*/ - virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *tqparent, + virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem ); }; @@ -62,7 +62,7 @@ class ServerTreeView : public BaseTreeView { TQ_OBJECT public: - ServerTreeView(KConfig *config, TQWidget *tqparent, const KURL &url, const char *name = 0L); + ServerTreeView(KConfig *config, TQWidget *parent, const KURL &url, const char *name = 0L); virtual ~ServerTreeView(); protected slots: diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp index fb0573a4..e897d14c 100644 --- a/quanta/treeviews/structtreetag.cpp +++ b/quanta/treeviews/structtreetag.cpp @@ -31,20 +31,20 @@ #include "document.h" #include "resource.h" -StructTreeTag::StructTreeTag(TQListView *tqparent, TQString a_title) - : KListViewItem(tqparent, a_title) +StructTreeTag::StructTreeTag(TQListView *parent, TQString a_title) + : KListViewItem(parent, a_title) { node = 0L; hasOpenFileMenu = false; groupTag = 0L; - parentTree = static_cast<StructTreeView*>(tqparent); + parentTree = static_cast<StructTreeView*>(parent); } -StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQString a_title, +StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString a_title, TQListViewItem *after ) -: KListViewItem(tqparent, after, a_title) +: KListViewItem(parent, after, a_title) { - parentTree = tqparent->parentTree; + parentTree = parent->parentTree; hasOpenFileMenu = false; groupTag = 0L; static const TQString space = " "; @@ -106,8 +106,8 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQStri if (!typingInProgress) { TQTag *parentTQTag = 0L; - if (node->tqparent) - parentTQTag = QuantaCommon::tagFromDTD(node->tqparent); + if (node->parent) + parentTQTag = QuantaCommon::tagFromDTD(node->parent); TQString qTagName = node->tag->dtd()->caseSensitive ? node->tag->name : node->tag->name.upper(); int line, col; node->tag->beginPos(line, col); @@ -115,7 +115,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQStri !parentTQTag->childTags.isEmpty()) { node->tag->write()->setErrorMark(line); - TQString parentTagName = node->tag->dtd()->caseSensitive ? node->tqparent->tag->name : node->tqparent->tag->name.upper(); + TQString parentTagName = node->tag->dtd()->caseSensitive ? node->parent->tag->name : node->parent->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; @@ -201,13 +201,13 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQStri } } -StructTreeTag::StructTreeTag(StructTreeTag *tqparent, TQString a_title ) -: KListViewItem(tqparent, a_title) +StructTreeTag::StructTreeTag(StructTreeTag *parent, TQString a_title ) +: KListViewItem(parent, a_title) { node = 0L; hasOpenFileMenu = false; groupTag = 0L; - parentTree = tqparent->parentTree; + parentTree = parent->parentTree; } diff --git a/quanta/treeviews/structtreetag.h b/quanta/treeviews/structtreetag.h index 6170870d..2f408707 100644 --- a/quanta/treeviews/structtreetag.h +++ b/quanta/treeviews/structtreetag.h @@ -30,9 +30,9 @@ class StructTreeView; class StructTreeTag : public KListViewItem { public: - StructTreeTag(TQListView *tqparent, const TQString a_title = TQString() ); - StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQString a_title = TQString(), TQListViewItem *after = 0L); - StructTreeTag(StructTreeTag *tqparent, const TQString a_title = TQString() ); + StructTreeTag(TQListView *parent, const TQString a_title = TQString() ); + StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString a_title = TQString(), TQListViewItem *after = 0L); + StructTreeTag(StructTreeTag *parent, const TQString a_title = TQString() ); ~StructTreeTag(); Node *node; diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index c6c23fde..24f48174 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -57,8 +57,8 @@ #include "structtreeview.moc" extern GroupElementMapList globalGroupMap; -StructTreeView::StructTreeView(TQWidget *tqparent, const char *name ) - : KListView(tqparent,name), m_marker(0), m_draggedItem(0)/*, m_thisWidget(0)*/ +StructTreeView::StructTreeView(TQWidget *parent, const char *name ) + : KListView(parent,name), m_marker(0), m_draggedItem(0)/*, m_thisWidget(0)*/ { for (int i = 0; i < 15; i++) groupOpened.append(false); @@ -276,27 +276,27 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly) currentItem = item; } else { - //go up some levels, to the tqparent, if the node has no child or next + //go up some levels, to the parent, if the node has no child or next while (currentNode) { level--; - //parentItem = dynamic_cast<StructTreeTag*>(parentItem->tqparent()); - if (currentNode->tqparent && currentNode->tqparent->next) + //parentItem = dynamic_cast<StructTreeTag*>(parentItem->parent()); + if (currentNode->parent && currentNode->parent->next) { - currentNode = currentNode->tqparent->next; + currentNode = currentNode->parent->next; break; } else { - currentNode = currentNode->tqparent; + currentNode = currentNode->parent; } } if (!groupOnly && currentNode) { if (currentNode->prev) currentItem = static_cast<StructTreeTag*>(currentNode->prev->mainListItem); - if (currentNode->tqparent) + if (currentNode->parent) { - parentItem = static_cast<StructTreeTag*>(currentNode->tqparent->mainListItem); + parentItem = static_cast<StructTreeTag*>(currentNode->parent->mainListItem); if (!parentItem) { parentItem = top; @@ -800,7 +800,7 @@ bool StructTreeView::acceptDrag(TQDropEvent* e) const kdDebug(25001) << "PROIBIDO! #2" << endl; return false; } - TQTag* nodeTQTag = QuantaCommon::tagFromDTD(after_node->tqparent); + TQTag* nodeTQTag = QuantaCommon::tagFromDTD(after_node->parent); bool is_child = (nodeTQTag && nodeTQTag->isChild(dragged_node)); if(!is_child) @@ -818,7 +818,7 @@ bool StructTreeView::acceptDrag(TQDropEvent* e) const return is_child; } -void StructTreeView::slotDropped(TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after) +void StructTreeView::slotDropped(TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after) { if(!e) return; @@ -837,10 +837,10 @@ void StructTreeView::slotDropped(TQDropEvent* e, TQListViewItem* tqparent, TQLis switch(id) { case DRAG_COPY: - copySelectedItems(tqparent, after); + copySelectedItems(parent, after); break; case DRAG_MOVE: - moveSelectedItems(tqparent, after); + moveSelectedItems(parent, after); break; case DRAG_CANCEL: // cancelled by menuitem break; @@ -875,9 +875,9 @@ void StructTreeView::contentsMousePressEvent(TQMouseEvent* e) KListView::contentsMousePressEvent(e); } -void StructTreeView::copySelectedItems(TQListViewItem* tqparent, TQListViewItem* after) +void StructTreeView::copySelectedItems(TQListViewItem* parent, TQListViewItem* after) { - StructTreeTag* parent_item = dynamic_cast<StructTreeTag*> (tqparent); + StructTreeTag* parent_item = dynamic_cast<StructTreeTag*> (parent); StructTreeTag* after_item = dynamic_cast<StructTreeTag*> (after); if(!parent_item/* || !after_item*/) // can happen if the element is inserted as the first child return; @@ -913,9 +913,9 @@ void StructTreeView::copySelectedItems(TQListViewItem* tqparent, TQListViewItem* write->docUndoRedo->addNewModifsSet(modifs, undoRedo::NodeTreeModif, 0, false); } -void StructTreeView::moveSelectedItems(TQListViewItem* tqparent, TQListViewItem* after) +void StructTreeView::moveSelectedItems(TQListViewItem* parent, TQListViewItem* after) { - StructTreeTag* parent_item = dynamic_cast<StructTreeTag*> (tqparent); + StructTreeTag* parent_item = dynamic_cast<StructTreeTag*> (parent); StructTreeTag* after_item = dynamic_cast<StructTreeTag*> (after); if(!parent_item || !after_item) return; diff --git a/quanta/treeviews/structtreeview.h b/quanta/treeviews/structtreeview.h index 09a95a07..66c6b68e 100644 --- a/quanta/treeviews/structtreeview.h +++ b/quanta/treeviews/structtreeview.h @@ -49,10 +49,10 @@ public: * the parameters are only used at the first call to create the class * */ - static StructTreeView* const ref(TQWidget *tqparent = 0L, const char *name = 0L) + static StructTreeView* const ref(TQWidget *parent = 0L, const char *name = 0L) { static StructTreeView *m_ref; - if (!m_ref) m_ref = new StructTreeView (tqparent, name); + if (!m_ref) m_ref = new StructTreeView (parent, name); return m_ref; } @@ -113,7 +113,7 @@ private: * If you need the class use StructTreeView::ref() for * construction and reference */ - StructTreeView(TQWidget *tqparent=0, const char *name=0); + StructTreeView(TQWidget *parent=0, const char *name=0); /** builds the structure tree */ void buildTree(Node *baseNode, int openLevel, bool groupOnly); /** Do the recursive opening or closing of the trees */ @@ -122,8 +122,8 @@ private: /** Make ctrl have the same behavior has shift */ void setContiguousSelectedItems(); - void copySelectedItems(TQListViewItem* tqparent, TQListViewItem* after); - void moveSelectedItems(TQListViewItem* tqparent, TQListViewItem* after); + void copySelectedItems(TQListViewItem* parent, TQListViewItem* after); + void moveSelectedItems(TQListViewItem* parent, TQListViewItem* after); private: @@ -167,7 +167,7 @@ protected slots: // Protected slots void slotDTDChanged(int id); void slotMouseClickedVPL(int button, TQListViewItem*, const TQPoint&, int); - virtual void slotDropped(TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after); + virtual void slotDropped(TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after); protected: // Protected attributes Document *write; diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp index 1483e98d..50e4825e 100644 --- a/quanta/treeviews/tagattributeitems.cpp +++ b/quanta/treeviews/tagattributeitems.cpp @@ -40,13 +40,13 @@ #include "qextfileinfo.h" #include "styleeditor.h" -TopLevelItem::TopLevelItem(KListView* tqparent, const TQString &title) -: KListViewItem(tqparent, title) +TopLevelItem::TopLevelItem(KListView* parent, const TQString &title) +: KListViewItem(parent, title) { } -TopLevelItem::TopLevelItem(KListView* tqparent, TQListViewItem* after, const TQString &title) -: KListViewItem(tqparent, after, title) +TopLevelItem::TopLevelItem(KListView* parent, TQListViewItem* after, const TQString &title) +: KListViewItem(parent, after, title) { } @@ -62,7 +62,7 @@ void TopLevelItem::paintCell(TQPainter *p, const TQColorGroup &cg, return; // make toplevel item names bold - if (column == 0 && !tqparent()) + if (column == 0 && !parent()) { TQFont f = p->font(); f.setBold(true); @@ -76,8 +76,8 @@ void TopLevelItem::paintCell(TQPainter *p, const TQColorGroup &cg, } } -ParentItem::ParentItem(TagAttributeTree *listView, TQListViewItem* tqparent) -: KListViewItem(tqparent) +ParentItem::ParentItem(TagAttributeTree *listView, TQListViewItem* parent) +: KListViewItem(parent) { m_listView = listView; comboBox = new TQComboBox(false, m_listView->viewport() ); @@ -143,15 +143,15 @@ void ParentItem::showList(bool show) } //Generic attribute item -AttributeItem::AttributeItem(TQListViewItem* tqparent, const TQString &title, const TQString& title2) -: KListViewItem(tqparent, title, title2) +AttributeItem::AttributeItem(TQListViewItem* parent, const TQString &title, const TQString& title2) +: KListViewItem(parent, title, title2) { lin = 0L; lin2 = 0L; } -AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2) -: KListViewItem(tqparent, title, title2) +AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2) +: KListViewItem(parent, title, title2) { m_listView = listView; lin = new TQLineEdit( m_listView->viewport() ); @@ -284,8 +284,8 @@ void AttributeItem::placeEditor( TQWidget *w, int column) } //Boolean attribute item -AttributeBoolItem::AttributeBoolItem(TagAttributeTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2) -: AttributeItem(tqparent, title, title2) +AttributeBoolItem::AttributeBoolItem(TagAttributeTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2) +: AttributeItem(parent, title, title2) { m_listView = listView; combo = new TQComboBox( m_listView->viewport() ); @@ -324,8 +324,8 @@ void AttributeBoolItem::hideEditor(int) } //Boolean attribute item -AttributeUrlItem::AttributeUrlItem(TagAttributeTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2) -: AttributeItem(tqparent, title, title2) +AttributeUrlItem::AttributeUrlItem(TagAttributeTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2) +: AttributeItem(parent, title, title2) { m_listView = listView; urlRequester = new KURLRequester( m_listView->viewport() ); @@ -375,8 +375,8 @@ void AttributeUrlItem::hideEditor(int) //editable listbox //Boolean attribute item -AttributeListItem::AttributeListItem(EditableTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2, Attribute *attr) -: AttributeItem(tqparent, title, title2) +AttributeListItem::AttributeListItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2, Attribute *attr) +: AttributeItem(parent, title, title2) { m_listView = listView; combo = new TQComboBox( m_listView->viewport() ); @@ -455,8 +455,8 @@ void AttributeListItem::hideEditor(int) } //editable color combobox -AttributeColorItem::AttributeColorItem(EditableTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2) -: AttributeItem(tqparent, title, title2) +AttributeColorItem::AttributeColorItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2) +: AttributeItem(parent, title, title2) { m_listView = listView; combo = new KColorCombo( m_listView->viewport() ); @@ -499,8 +499,8 @@ void AttributeColorItem::hideEditor(int) } //editable style combobox -AttributeStyleItem::AttributeStyleItem(EditableTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2) -: AttributeItem(tqparent, title, title2) +AttributeStyleItem::AttributeStyleItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2) +: AttributeItem(parent, title, title2) { m_listView = listView; m_se = new StyleEditor( m_listView->viewport() ); diff --git a/quanta/treeviews/tagattributeitems.h b/quanta/treeviews/tagattributeitems.h index 6992e14e..81f5cb43 100644 --- a/quanta/treeviews/tagattributeitems.h +++ b/quanta/treeviews/tagattributeitems.h @@ -35,8 +35,8 @@ class TopLevelItem : public KListViewItem { public: - TopLevelItem(KListView *tqparent, const TQString& title); - TopLevelItem(KListView *tqparent, TQListViewItem* after, const TQString& title); + TopLevelItem(KListView *parent, const TQString& title); + TopLevelItem(KListView *parent, TQListViewItem* after, const TQString& title); virtual ~TopLevelItem(); @@ -50,7 +50,7 @@ class ParentItem : public KListViewItem { public: - ParentItem(TagAttributeTree *listView, TQListViewItem *tqparent); + ParentItem(TagAttributeTree *listView, TQListViewItem *parent); virtual ~ParentItem(); Node *node(int index); @@ -71,8 +71,8 @@ private: class AttributeItem : public KListViewItem { public: - AttributeItem(TQListViewItem* tqparent, const TQString& title, const TQString& title2); - AttributeItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2); + AttributeItem(TQListViewItem* parent, const TQString& title, const TQString& title2); + AttributeItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2); AttributeItem(EditableTree *listView, const TQString& title, const TQString& title2); AttributeItem(EditableTree *listView, const TQString& title, const TQString& title2, TQListViewItem* after); @@ -97,8 +97,8 @@ protected: class AttributeNameSpaceItem:public AttributeItem { public: - AttributeNameSpaceItem(TQListViewItem* tqparent, const TQString& title, const TQString& title2): AttributeItem(tqparent, title, title2){}; - AttributeNameSpaceItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2):AttributeItem(listView, tqparent, title, title2){}; + AttributeNameSpaceItem(TQListViewItem* parent, const TQString& title, const TQString& title2): AttributeItem(parent, title, title2){}; + AttributeNameSpaceItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2):AttributeItem(listView, parent, title, title2){}; virtual ~AttributeNameSpaceItem(){}; }; @@ -106,7 +106,7 @@ public: class AttributeBoolItem : public AttributeItem { public: - AttributeBoolItem(TagAttributeTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2); + AttributeBoolItem(TagAttributeTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2); virtual ~AttributeBoolItem(); virtual void showEditor(int column = 1); @@ -120,7 +120,7 @@ private: class AttributeUrlItem : public AttributeItem { public: - AttributeUrlItem(TagAttributeTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2); + AttributeUrlItem(TagAttributeTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2); virtual ~AttributeUrlItem(); virtual void showEditor(int column = 1); @@ -134,7 +134,7 @@ private: class AttributeListItem : public AttributeItem { public: - AttributeListItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2, Attribute *attr = 0L); + AttributeListItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2, Attribute *attr = 0L); virtual ~AttributeListItem(); virtual void showEditor(int column = 1); @@ -148,7 +148,7 @@ private: class AttributeColorItem : public AttributeItem { public: - AttributeColorItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2); + AttributeColorItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2); virtual ~AttributeColorItem(); virtual void showEditor(int column = 1); @@ -162,7 +162,7 @@ private: class AttributeStyleItem : public AttributeItem { public: - AttributeStyleItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2); + AttributeStyleItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2); virtual ~AttributeStyleItem(); virtual void showEditor(int column = 1); diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index d143caa7..0ef63151 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -50,8 +50,8 @@ #include "viewmanager.h" -EditableTree::EditableTree(TQWidget *tqparent, const char *name) -: KListView(tqparent, name) +EditableTree::EditableTree(TQWidget *parent, const char *name) +: KListView(parent, name) { m_editable = true; } @@ -100,8 +100,8 @@ void EditableTree::focusOutEvent(TQFocusEvent *) }*/ } -DualEditableTree::DualEditableTree(TQWidget *tqparent, const char *name) -: EditableTree(tqparent, name) +DualEditableTree::DualEditableTree(TQWidget *parent, const char *name) +: EditableTree(parent, name) { curCol = 0; setFocusPolicy(TQ_ClickFocus); @@ -216,8 +216,8 @@ void DualEditableTree::itemClicked(TQListViewItem *item, const TQPoint &, int co } } -TagAttributeTree::TagAttributeTree(TQWidget *tqparent, const char *name) -: EditableTree(tqparent, name) +TagAttributeTree::TagAttributeTree(TQWidget *parent, const char *name) +: EditableTree(parent, name) { setRootIsDecorated( true ); setSorting(-1); @@ -247,9 +247,9 @@ void TagAttributeTree::setCurrentNode(Node *node) return; clear(); m_parentItem = 0L; - //We don't want to be able to edit the text node but it's tqparent. + //We don't want to be able to edit the text node but it's parent. if (node && node->tag->type == Tag::Text) - m_node = node = node->tqparent; + m_node = node = node->parent; if (!node) return; #ifdef HEAVY_DEBUG @@ -260,7 +260,7 @@ void TagAttributeTree::setCurrentNode(Node *node) TopLevelItem *group = 0L; TQString attrName; TQTag *qTag = QuantaCommon::tagFromDTD(node); - Node *n = node->tqparent; + Node *n = node->parent; while (n) { if (n->tag->type == Tag::XmlTag) @@ -272,7 +272,7 @@ void TagAttributeTree::setCurrentNode(Node *node) } m_parentItem->addNode(n); } - n = n->tqparent; + n = n->parent; } if (m_parentItem) @@ -429,13 +429,13 @@ void TagAttributeTree::slotParentSelected(int index) void TagAttributeTree::slotCollapsed(TQListViewItem *item) { - if (m_parentItem && item == m_parentItem->tqparent()) + if (m_parentItem && item == m_parentItem->parent()) m_parentItem->showList(false); } void TagAttributeTree::slotExpanded(TQListViewItem *item) { - if (m_parentItem && item == m_parentItem->tqparent()) + if (m_parentItem && item == m_parentItem->parent()) m_parentItem->showList(true); } @@ -451,8 +451,8 @@ void TagAttributeTree::slotDelayedSetCurrentNode() } } -EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *tqparent, const char *name) -: TQWidget(tqparent, name) +EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char *name) +: TQWidget(parent, name) { widgetLayout = new TQGridLayout( this, 1, 1, 11, 6, "MainLayout"); @@ -501,9 +501,9 @@ void EnhancedTagAttributeTree::setCurrentNode(Node *node) void EnhancedTagAttributeTree::NodeSelected(Node *node) { curNode = node; - //We don't want to be able to edit the text node but it's tqparent. + //We don't want to be able to edit the text node but it's parent. if (node && node->tag->type == Tag::Text) - curNode = node = node->tqparent; + curNode = node = node->parent; showCaption(); emit newNodeSelected(node); } @@ -614,14 +614,14 @@ void EnhancedTagAttributeTree::deleteNode() //remove the Nodes oldCurNode = curNode; - oldCurNodeParent = curNode->tqparent; + oldCurNodeParent = curNode->parent; curNode = 0L; attrTree->setCurrentNode(curNode); modifs = new NodeModifsSet(); kafkaCommon::extractAndDeleteNode(oldCurNode, modifs, false); - //Then we see if the new tqparent - child relationships are valid, and if not, delete the child and restart + //Then we see if the new parent - child relationships are valid, and if not, delete the child and restart if(oldCurNodeParent) { oldCurNodeParentTQTag = QuantaCommon::tagFromDTD(oldCurNodeParent); diff --git a/quanta/treeviews/tagattributetree.h b/quanta/treeviews/tagattributetree.h index 32dea87a..c36c3406 100644 --- a/quanta/treeviews/tagattributetree.h +++ b/quanta/treeviews/tagattributetree.h @@ -36,7 +36,7 @@ Q_OBJECT TQ_OBJECT public: - EditableTree(TQWidget *tqparent = 0, const char *name = 0); + EditableTree(TQWidget *parent = 0, const char *name = 0); virtual ~EditableTree(); virtual void setCurrentItem( TQListViewItem *i); @@ -58,7 +58,7 @@ class DualEditableTree : public EditableTree Q_OBJECT TQ_OBJECT public: - DualEditableTree(TQWidget *tqparent = 0, const char *name = 0); + DualEditableTree(TQWidget *parent = 0, const char *name = 0); virtual ~DualEditableTree(); virtual void setCurrentItem ( TQListViewItem *i); @@ -86,7 +86,7 @@ class TagAttributeTree : public EditableTree { TQ_OBJECT public: - TagAttributeTree(TQWidget *tqparent=0, const char *name=0); + TagAttributeTree(TQWidget *parent=0, const char *name=0); virtual ~TagAttributeTree(); void setCurrentNode(Node *node); @@ -118,7 +118,7 @@ class EnhancedTagAttributeTree : public TQWidget Q_OBJECT TQ_OBJECT public: - EnhancedTagAttributeTree(TQWidget *tqparent = 0, const char *name = 0); + EnhancedTagAttributeTree(TQWidget *parent = 0, const char *name = 0); virtual ~EnhancedTagAttributeTree(); void setCurrentNode(Node *node); diff --git a/quanta/treeviews/templatedirform.ui b/quanta/treeviews/templatedirform.ui index 54e8637b..d08f6b28 100644 --- a/quanta/treeviews/templatedirform.ui +++ b/quanta/treeviews/templatedirform.ui @@ -60,7 +60,7 @@ <cstring>parentAttr</cstring> </property> <property name="text"> - <string>&Inherit tqparent attribute</string> + <string>&Inherit parent attribute</string> </property> </widget> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index 51928bcf..ae828dcb 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -79,22 +79,22 @@ TQMap<TQString, TQString> i18nToType; //TemplatesTreeBranch implementation -TemplatesTreeBranch::TemplatesTreeBranch(KFileTreeView *tqparent, const KURL& url, +TemplatesTreeBranch::TemplatesTreeBranch(KFileTreeView *parent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden, KFileTreeViewItem *branchRoot) - : BaseTreeBranch(tqparent, url, name, pix, showHidden, branchRoot) + : BaseTreeBranch(parent, url, name, pix, showHidden, branchRoot) { } -KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparent, +KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem ) { BaseTreeViewItem *tvi = 0; - if( tqparent && fileItem ) + if( parent && fileItem ) { KURL url = fileItem->url(); - tvi = new BaseTreeViewItem( tqparent, fileItem, this ); + tvi = new BaseTreeViewItem( parent, fileItem, this ); if (tvi && fileItem->isDir()) { if (url.isLocalFile()) @@ -106,7 +106,7 @@ KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *tq } } else { - url = static_cast<BaseTreeViewItem*>(tqparent)->url(); + url = static_cast<BaseTreeViewItem*>(parent)->url(); } TQFileInfo dotFileInfo(url.path() + "/.dirinfo"); while ((!dotFileInfo.exists()) && (dotFileInfo.dirPath() != "/")) @@ -123,14 +123,14 @@ KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *tq } else - kdDebug(24000) << "TemplatesTreeBranch::createTreeViewItem: Have no tqparent" << endl; + kdDebug(24000) << "TemplatesTreeBranch::createTreeViewItem: Have no parent" << endl; return tvi; } -TemplatesTreeView::TemplatesTreeView(KMainWindow *tqparent, const char *name ) - : BaseTreeView(tqparent,name), m_projectDir(0), m_mainWindow(tqparent) +TemplatesTreeView::TemplatesTreeView(KMainWindow *parent, const char *name ) + : BaseTreeView(parent,name), m_projectDir(0), m_mainWindow(parent) { typeToi18n["text/all"] = i18n("Text Snippet"); typeToi18n["file/all"] = i18n("Binary File"); @@ -383,10 +383,10 @@ void TemplatesTreeView::slotNewDir() if (m_dirInfo.mimeType.isEmpty()) { - createDirDlg->parentAttr->setText(i18n("&Inherit tqparent attribute (nothing)")); + createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (nothing)")); } else { - createDirDlg->parentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_dirInfo.mimeType])); + createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (%1)").tqarg(typeToi18n[m_dirInfo.mimeType])); } if (createDirDlg->exec()) { @@ -616,10 +616,10 @@ void TemplatesTreeView::slotProperties() } if (m_parentDirInfo.mimeType.isEmpty()) { - m_quantaProperties->parentAttr->setText(i18n("&Inherit tqparent attribute (nothing)")); + m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (nothing)")); } else { - m_quantaProperties->parentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_parentDirInfo.mimeType])); + m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (%1)").tqarg(typeToi18n[m_parentDirInfo.mimeType])); } m_quantaProperties->preTextEdit->setText(m_dirInfo.preText); m_quantaProperties->postTextEdit->setText(m_dirInfo.postText); @@ -709,10 +709,10 @@ void TemplatesTreeView::slotPropertiesApplied() bool result = writeDirInfo(); KFileTreeViewItem *item = currentKFileTreeViewItem(); if (item && !item->isDir()) - item = static_cast<KFileTreeViewItem *>(item->tqparent()); + item = static_cast<KFileTreeViewItem *>(item->parent()); if (result && item && !typeString.isEmpty()) { - if (item->tqparent() && item->isDir()) + if (item->parent() && item->isDir()) item->setText(1, typeString); updateTypeDescription(item, typeString); } @@ -723,7 +723,7 @@ void TemplatesTreeView::slotPropertiesApplied() void TemplatesTreeView::updateTypeDescription(KFileTreeViewItem *item, const TQString &typeString) { - if (item->tqparent() && item->isDir()) + if (item->parent() && item->isDir()) item->setText(1, typeString); KFileTreeViewItem *curItem = static_cast<KFileTreeViewItem *>(item->firstChild()); while (curItem && curItem != static_cast<KFileTreeViewItem *>(item->nextSibling())) diff --git a/quanta/treeviews/templatestreeview.h b/quanta/treeviews/templatestreeview.h index efccc56a..017d3c06 100644 --- a/quanta/treeviews/templatestreeview.h +++ b/quanta/treeviews/templatestreeview.h @@ -27,12 +27,12 @@ class KMainWindow; class TemplatesTreeBranch : public BaseTreeBranch { public: - TemplatesTreeBranch(KFileTreeView *tqparent, const KURL& url, + TemplatesTreeBranch(KFileTreeView *parent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden = false, KFileTreeViewItem *branchRoot = 0L); /** read the mimetype */ - virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *tqparent, + virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem ); }; @@ -49,10 +49,10 @@ public: * the parameter are only used at the first call to create the class * */ - static TemplatesTreeView* const ref(KMainWindow *tqparent = 0L, const char *name = 0L) + static TemplatesTreeView* const ref(KMainWindow *parent = 0L, const char *name = 0L) { static TemplatesTreeView *m_ref; - if (!m_ref) m_ref = new TemplatesTreeView (tqparent, name); + if (!m_ref) m_ref = new TemplatesTreeView (parent, name); return m_ref; } @@ -119,7 +119,7 @@ private: * If you need the class use TemplatesTreeView::ref() for * construction and reference */ - TemplatesTreeView(KMainWindow *tqparent, const char *name = 0L); + TemplatesTreeView(KMainWindow *parent, const char *name = 0L); /** Filters the template through and action, and returns the modified/filtered template file */ KURL filterTemplate(); diff --git a/quanta/treeviews/uploadtreefile.cpp b/quanta/treeviews/uploadtreefile.cpp index b4ad6845..c4c40197 100644 --- a/quanta/treeviews/uploadtreefile.cpp +++ b/quanta/treeviews/uploadtreefile.cpp @@ -27,12 +27,12 @@ #include "uploadtreefile.h" #include "resource.h" -UploadTreeFile::UploadTreeFile( UploadTreeFolder *tqparent, const KURL &a_url, const KFileItem &a_fileItem) - : KListViewItem( tqparent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString()) +UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, const KFileItem &a_fileItem) + : KListViewItem( parent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString()) { m_url = a_url; isDir = false; - parentFolder = tqparent; + parentFolder = parent; m_fileItem = new KFileItem(a_fileItem); m_confirm = false; @@ -40,8 +40,8 @@ UploadTreeFile::UploadTreeFile( UploadTreeFolder *tqparent, const KURL &a_url, c setText(0, m_url.fileName()); } -UploadTreeFile::UploadTreeFile( TQListView *tqparent, const KURL &a_url, const KFileItem &a_fileItem) - : KListViewItem( tqparent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString()) +UploadTreeFile::UploadTreeFile( TQListView *parent, const KURL &a_url, const KFileItem &a_fileItem) + : KListViewItem( parent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString()) { m_url = a_url; isDir = false; diff --git a/quanta/treeviews/uploadtreefile.h b/quanta/treeviews/uploadtreefile.h index 246b3fe0..736a3a88 100644 --- a/quanta/treeviews/uploadtreefile.h +++ b/quanta/treeviews/uploadtreefile.h @@ -28,8 +28,8 @@ class KFileItem; class UploadTreeFile : public KListViewItem { public: - UploadTreeFile( UploadTreeFolder *tqparent, const KURL &a_url, const KFileItem &a_fileItem); - UploadTreeFile( TQListView *tqparent, const KURL &a_url, const KFileItem &a_fileItem); + UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, const KFileItem &a_fileItem); + UploadTreeFile( TQListView *parent, const KURL &a_url, const KFileItem &a_fileItem); ~UploadTreeFile(); void setWhichPixmap(const TQString& pixmap); diff --git a/quanta/treeviews/uploadtreefolder.cpp b/quanta/treeviews/uploadtreefolder.cpp index 7e719912..123eaf35 100644 --- a/quanta/treeviews/uploadtreefolder.cpp +++ b/quanta/treeviews/uploadtreefolder.cpp @@ -27,10 +27,10 @@ #include "uploadtreefile.h" #include "resource.h" -UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * tqparent, const char * name ) - : KListViewItem( tqparent, name, "", "", "" ) +UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * parent, const char * name ) + : KListViewItem( parent, name, "", "", "" ) { - parentFolder = tqparent; + parentFolder = parent; m_url = a_url; m_url.adjustPath(1); @@ -40,8 +40,8 @@ UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * tqparen } -UploadTreeFolder::UploadTreeFolder(const KURL &a_url, TQListView * tqparent, const char * name ) - : KListViewItem( tqparent, name, "", "", "" ) +UploadTreeFolder::UploadTreeFolder(const KURL &a_url, TQListView * parent, const char * name ) + : KListViewItem( parent, name, "", "", "" ) { parentFolder = 0L; m_url = a_url; diff --git a/quanta/treeviews/uploadtreefolder.h b/quanta/treeviews/uploadtreefolder.h index fd08276f..d6959ab3 100644 --- a/quanta/treeviews/uploadtreefolder.h +++ b/quanta/treeviews/uploadtreefolder.h @@ -32,8 +32,8 @@ class KURL; class UploadTreeFolder : public KListViewItem { public: - UploadTreeFolder( const KURL &a_url, TQListView * tqparent, const char * name); - UploadTreeFolder( const KURL &a_url, UploadTreeFolder * tqparent, const char * name ); + UploadTreeFolder( const KURL &a_url, TQListView * parent, const char * name); + UploadTreeFolder( const KURL &a_url, UploadTreeFolder * parent, const char * name ); virtual ~UploadTreeFolder(); /** used for sorting */ diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp index 4318a096..8f5457e2 100644 --- a/quanta/treeviews/uploadtreeview.cpp +++ b/quanta/treeviews/uploadtreeview.cpp @@ -23,8 +23,8 @@ #include "uploadtreeview.h" #include "quantacommon.h" -UploadTreeView::UploadTreeView( TQWidget *tqparent, const char *name ) : - KListView(tqparent, name) +UploadTreeView::UploadTreeView( TQWidget *parent, const char *name ) : + KListView(parent, name) { setRootIsDecorated( true ); setSorting( 0 ); diff --git a/quanta/treeviews/uploadtreeview.h b/quanta/treeviews/uploadtreeview.h index 19d487db..56f4bff0 100644 --- a/quanta/treeviews/uploadtreeview.h +++ b/quanta/treeviews/uploadtreeview.h @@ -33,7 +33,7 @@ class UploadTreeView : public KListView { Q_OBJECT TQ_OBJECT public: - UploadTreeView( TQWidget *tqparent, const char *name=0L ); + UploadTreeView( TQWidget *parent, const char *name=0L ); ~UploadTreeView(); UploadTreeFile* addItem( const KURL &a_url, const KFileItem &a_fileItem); TQListViewItem* findItem( const TQString& ); |