From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 14 Jun 2011 16:45:05 +0000 Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- parts/fileview/addfilegroupdlg.cpp | 14 ++++---- parts/fileview/addfilegroupdlg.h | 5 +-- parts/fileview/filegroupsconfigwidget.cpp | 4 +-- parts/fileview/filegroupsconfigwidget.h | 3 +- parts/fileview/filegroupsconfigwidgetbase.ui | 34 +++++++++---------- parts/fileview/filegroupspart.cpp | 4 +-- parts/fileview/filegroupspart.h | 3 +- parts/fileview/filegroupswidget.cpp | 34 +++++++++---------- parts/fileview/filegroupswidget.h | 1 + parts/fileview/fileitemfactory.cpp | 10 +++--- parts/fileview/fileitemfactory.h | 10 +++--- parts/fileview/filetreeviewwidgetimpl.cpp | 10 +++--- parts/fileview/filetreeviewwidgetimpl.h | 5 +-- parts/fileview/filetreewidget.cpp | 14 ++++---- parts/fileview/filetreewidget.h | 3 +- parts/fileview/fileviewpart.cpp | 4 +-- parts/fileview/fileviewpart.h | 3 +- parts/fileview/partwidget.cpp | 16 ++++----- parts/fileview/partwidget.h | 5 +-- parts/fileview/stdfiletreewidgetimpl.cpp | 24 ++++++------- parts/fileview/stdfiletreewidgetimpl.h | 3 +- parts/fileview/vcscolorsconfigwidget.cpp | 4 +-- parts/fileview/vcscolorsconfigwidget.h | 3 +- parts/fileview/vcscolorsconfigwidgetbase.ui | 24 ++++++------- parts/fileview/vcsfiletreewidgetimpl.cpp | 50 ++++++++++++++-------------- parts/fileview/vcsfiletreewidgetimpl.h | 3 +- 26 files changed, 152 insertions(+), 141 deletions(-) (limited to 'parts/fileview') diff --git a/parts/fileview/addfilegroupdlg.cpp b/parts/fileview/addfilegroupdlg.cpp index b59f2ad2..112eec4a 100644 --- a/parts/fileview/addfilegroupdlg.cpp +++ b/parts/fileview/addfilegroupdlg.cpp @@ -20,8 +20,8 @@ #include "addfilegroupdlg.h" -AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString& old_pattern, TQWidget *parent, const char *name) - : TQDialog(parent, name, true) +AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString& old_pattern, TQWidget *tqparent, const char *name) + : TQDialog(tqparent, name, true) { TQLabel *title_label = new TQLabel(i18n("&Title:"), this); title_edit = new KLineEdit(old_title, this); @@ -35,10 +35,10 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString TQFontMetrics fm(pattern_edit->fontMetrics()); pattern_edit->setMinimumWidth(fm.width('X')*35); connect( pattern_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); - TQVBoxLayout *layout = new TQVBoxLayout(this, 10); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10); TQGridLayout *grid = new TQGridLayout(2, 2); - layout->addLayout(grid); + tqlayout->addLayout(grid); grid->addWidget(title_label, 0, 0); grid->addWidget(title_edit, 0, 1); grid->addWidget(pattern_label, 1, 0); @@ -46,7 +46,7 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString TQFrame *frame = new TQFrame(this); frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - layout->addWidget(frame, 0); + tqlayout->addWidget(frame, 0); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); @@ -56,8 +56,8 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString m_pOk->setDefault(true); connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); - buttonbox->layout(); - layout->addWidget(buttonbox, 0); + buttonbox->tqlayout(); + tqlayout->addWidget(buttonbox, 0); slotTextChanged(); } diff --git a/parts/fileview/addfilegroupdlg.h b/parts/fileview/addfilegroupdlg.h index 9692fe89..20c54d37 100644 --- a/parts/fileview/addfilegroupdlg.h +++ b/parts/fileview/addfilegroupdlg.h @@ -16,12 +16,13 @@ #include class TQPushButton; -class AddFileGroupDialog : public QDialog +class AddFileGroupDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - AddFileGroupDialog( const TQString& old_title="", const TQString& old_pattern="", TQWidget *parent=0, const char *name=0 ); + AddFileGroupDialog( const TQString& old_title="", const TQString& old_pattern="", TQWidget *tqparent=0, const char *name=0 ); ~AddFileGroupDialog(); TQString title() const diff --git a/parts/fileview/filegroupsconfigwidget.cpp b/parts/fileview/filegroupsconfigwidget.cpp index c1a4f5bc..277bab4e 100644 --- a/parts/fileview/filegroupsconfigwidget.cpp +++ b/parts/fileview/filegroupsconfigwidget.cpp @@ -21,8 +21,8 @@ FileGroupsConfigWidget::FileGroupsConfigWidget(FileGroupsPart *part, - TQWidget *parent, const char *name) - : FileGroupsConfigWidgetBase(parent, name) + TQWidget *tqparent, const char *name) + : FileGroupsConfigWidgetBase(tqparent, name) { m_part = part; diff --git a/parts/fileview/filegroupsconfigwidget.h b/parts/fileview/filegroupsconfigwidget.h index 7c2759cb..c236aa43 100644 --- a/parts/fileview/filegroupsconfigwidget.h +++ b/parts/fileview/filegroupsconfigwidget.h @@ -20,9 +20,10 @@ class FileGroupsPart; class FileGroupsConfigWidget : public FileGroupsConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: - FileGroupsConfigWidget( FileGroupsPart *widget, TQWidget *parent, const char *name=0 ); + FileGroupsConfigWidget( FileGroupsPart *widget, TQWidget *tqparent, const char *name=0 ); ~FileGroupsConfigWidget(); public slots: diff --git a/parts/fileview/filegroupsconfigwidgetbase.ui b/parts/fileview/filegroupsconfigwidgetbase.ui index 3b548458..9b2779f1 100644 --- a/parts/fileview/filegroupsconfigwidgetbase.ui +++ b/parts/fileview/filegroupsconfigwidgetbase.ui @@ -1,6 +1,6 @@ FileGroupsConfigWidgetBase - + filegroups_config_widget @@ -19,7 +19,7 @@ unnamed - + Layout3 @@ -30,7 +30,7 @@ 0 - + title_label @@ -41,7 +41,7 @@ listview - + Group @@ -76,7 +76,7 @@ - + Layout3 @@ -97,14 +97,14 @@ Expanding - + 20 20 - + addgroup_button @@ -112,7 +112,7 @@ &Add Group... - + editgroup_button @@ -120,7 +120,7 @@ &Edit Group... - + deletegroup_button @@ -138,14 +138,14 @@ Expanding - + 20 20 - + moveup_button @@ -153,7 +153,7 @@ Move &Up - + movedown_button @@ -171,7 +171,7 @@ Expanding - + 20 20 @@ -217,13 +217,13 @@ kdialog.h - + addGroup() editGroup() removeGroup() moveUp() moveDown() - - - + + + diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp index 4451ff2a..29dccd55 100644 --- a/parts/fileview/filegroupspart.cpp +++ b/parts/fileview/filegroupspart.cpp @@ -36,8 +36,8 @@ typedef KDevGenericFactory FileGroupsFactory; static const KDevPluginInfo data("kdevfilegroups"); K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) ) -FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "FileGroupsPart") +FileGroupsPart::FileGroupsPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(&data, tqparent, name ? name : "FileGroupsPart") { deleteRequested = false; setInstance(FileGroupsFactory::instance()); diff --git a/parts/fileview/filegroupspart.h b/parts/fileview/filegroupspart.h index 22cb055e..85f83164 100644 --- a/parts/fileview/filegroupspart.h +++ b/parts/fileview/filegroupspart.h @@ -23,9 +23,10 @@ class KDialogBase; class FileGroupsPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - FileGroupsPart( TQObject *parent, const char *name, const TQStringList & ); + FileGroupsPart( TQObject *tqparent, const char *name, const TQStringList & ); ~FileGroupsPart(); public slots: diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp index 14f1d50c..d2b1b8ad 100644 --- a/parts/fileview/filegroupswidget.cpp +++ b/parts/fileview/filegroupswidget.cpp @@ -74,10 +74,10 @@ private: const TQString m_pattern; }; -class FileViewFolderItem : public QListViewItem +class FileViewFolderItem : public TQListViewItem { public: - FileViewFolderItem(TQListView *parent, const TQString &name, const TQString &pattern); + FileViewFolderItem(TQListView *tqparent, const TQString &name, const TQString &pattern); bool matches(const TQString &fileName); private: @@ -85,8 +85,8 @@ private: }; -FileViewFolderItem::FileViewFolderItem(TQListView *parent, const TQString &name, const TQString &pattern) - : TQListViewItem(parent, name) +FileViewFolderItem::FileViewFolderItem(TQListView *tqparent, const TQString &name, const TQString &pattern) + : TQListViewItem(tqparent, name) { setPixmap(0, SmallIcon("folder")); m_patterns.setAutoDelete(true); @@ -97,7 +97,7 @@ FileViewFolderItem::FileViewFolderItem(TQListView *parent, const TQString &name, TQString pattern = *ci; TQString tail = pattern.right( pattern.length() - 1 ); - if ( (tail).contains('*') || pattern.contains('?') || pattern.contains('[') || pattern.contains(']') ) + if ( (tail).tqcontains('*') || pattern.tqcontains('?') || pattern.tqcontains('[') || pattern.tqcontains(']') ) { m_patterns.append( new RegExpComparator( pattern ) ); } @@ -130,10 +130,10 @@ bool FileViewFolderItem::matches(const TQString &fileName) } -class FileGroupsFileItem : public QListViewItem +class FileGroupsFileItem : public TQListViewItem { public: - FileGroupsFileItem(TQListViewItem *parent, const TQString &fileName); + FileGroupsFileItem(TQListViewItem *tqparent, const TQString &fileName); TQString fileName() const { return fullname; } @@ -142,8 +142,8 @@ private: }; -FileGroupsFileItem::FileGroupsFileItem(TQListViewItem *parent, const TQString &fileName) - : TQListViewItem(parent), fullname(fileName) +FileGroupsFileItem::FileGroupsFileItem(TQListViewItem *tqparent, const TQString &fileName) + : TQListViewItem(tqparent), fullname(fileName) { setPixmap(0, SmallIcon("document")); TQFileInfo fi(fileName); @@ -162,7 +162,7 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part) */ LocationID=-1; - setFocusPolicy(ClickFocus); + setFocusPolicy(TQ_ClickFocus); setRootIsDecorated(true); setResizeMode(TQListView::LastColumn); setSorting(-1); @@ -179,12 +179,12 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part) this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); m_actionToggleShowNonProjectFiles = new KToggleAction( i18n("Show Non Project Files"), KShortcut(), - this, TQT_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); + TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowNonProjectFiles()), TQT_TQOBJECT(this), "actiontoggleshowshownonprojectfiles" ); m_actionToggleShowNonProjectFiles->setCheckedState(i18n("Hide Non Project Files")); m_actionToggleShowNonProjectFiles->setWhatsThis(i18n("Show non project files

Shows files that do not belong to a project in a file tree.")); m_actionToggleDisplayLocation = new KToggleAction( i18n("Display Location Column"), KShortcut(), - this, TQT_SLOT(slotToggleDisplayLocation()), this, "actiontoggleshowlocation" ); + TQT_TQOBJECT(this), TQT_SLOT(slotToggleDisplayLocation()), TQT_TQOBJECT(this), "actiontoggleshowlocation" ); m_actionToggleDisplayLocation->setWhatsThis(i18n("Display the Location Column

Displays a column with the location of the files.")); m_part = part; @@ -209,12 +209,12 @@ void FileGroupsWidget::slotItemExecuted(TQListViewItem *item) if (!item) return; - // toggle open state for parents + // toggle open state for tqparents if (item->childCount() > 0) setOpen(item, !isOpen(item)); // Is it a group item? - if (!item->parent()) + if (!item->tqparent()) return; FileGroupsFileItem *fgfitem = static_cast(item); @@ -228,9 +228,9 @@ void FileGroupsWidget::slotContextMenu(KListView *, TQListViewItem *item, const popup.insertTitle(i18n("File Groups")); /// @todo Add, remove groups int customizeId = popup.insertItem(i18n("Customize...")); - popup.setWhatsThis(customizeId, i18n("Customize

Opens Customize File Groups dialog where the groups can be managed.")); + popup.tqsetWhatsThis(customizeId, i18n("Customize

Opens Customize File Groups dialog where the groups can be managed.")); if (item) { - if (item->parent()) { + if (item->tqparent()) { // Not for group items FileGroupsFileItem *fvfitem = static_cast(item); TQString pathName = m_part->project()->projectDirectory() + TQDir::separator() + fvfitem->fileName(); @@ -371,7 +371,7 @@ void FileGroupsWidget::addFile(const TQString &fileName) if (fvgitem->matches(fileName)) { TQString f = fileName; - if (fileName.contains(m_part->project()->projectDirectory())) + if (fileName.tqcontains(m_part->project()->projectDirectory())) f = fileName.mid(m_part->project()->projectDirectory().length()+1); (void) new FileGroupsFileItem(fvgitem, f); // fvgitem->sortChildItems(0, true); diff --git a/parts/fileview/filegroupswidget.h b/parts/fileview/filegroupswidget.h index cd7b2f63..b77bbf8d 100644 --- a/parts/fileview/filegroupswidget.h +++ b/parts/fileview/filegroupswidget.h @@ -21,6 +21,7 @@ class KDevProject; class FileGroupsWidget : public KListView { Q_OBJECT + TQ_OBJECT public: FileGroupsWidget(FileGroupsPart *part); diff --git a/parts/fileview/fileitemfactory.cpp b/parts/fileview/fileitemfactory.cpp index 3ccf5921..5f4478bc 100644 --- a/parts/fileview/fileitemfactory.cpp +++ b/parts/fileview/fileitemfactory.cpp @@ -50,7 +50,7 @@ bool FileTreeViewItem::changeActiveDir( const TQString& olddir, const TQString& m_isActiveDir = false; setVisible( listView()->shouldBeShown( this ) ); foundolddir = true; - repaint(); + tqrepaint(); } if ( this->path() == newdir && isDir() && !m_isActiveDir ) @@ -58,7 +58,7 @@ bool FileTreeViewItem::changeActiveDir( const TQString& olddir, const TQString& m_isActiveDir = true; setVisible( listView()->shouldBeShown( this ) ); foundnewdir = true; - repaint(); + tqrepaint(); } if( foundnewdir && foundolddir ) @@ -85,7 +85,7 @@ bool FileTreeViewItem::setProjectFile( TQString const & path, bool pf ) kdDebug( 9017 ) << "FileTreeViewItem::setProjectFile(): " + path << " projectfile: " << pf << endl; m_isProjectFile = pf; setVisible( listView()->shouldBeShown( this ) ); - repaint(); + tqrepaint(); return true; } @@ -103,7 +103,7 @@ bool FileTreeViewItem::setProjectFile( TQString const & path, bool pf ) /////////////////////////////////////////////////////////////////////////////// void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment) + int column, int width, int tqalignment) { if ( listView()->showNonProjectFiles() && isProjectFile() ) { @@ -119,7 +119,7 @@ void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, p->setFont( font ); } - TQListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, tqalignment ); } diff --git a/parts/fileview/fileitemfactory.h b/parts/fileview/fileitemfactory.h index 065591d7..fcb606fc 100644 --- a/parts/fileview/fileitemfactory.h +++ b/parts/fileview/fileitemfactory.h @@ -28,20 +28,20 @@ namespace filetreeview { friend class FileTreeBranchItem; protected: - FileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch, bool pf ) - : KFileTreeViewItem( parent, item, branch ), m_isProjectFile( pf ), m_isActiveDir( false ) + FileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch, bool pf ) + : KFileTreeViewItem( tqparent, item, branch ), m_isProjectFile( pf ), m_isActiveDir( false ) { hideOrShow(); } - FileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch ) - : KFileTreeViewItem( parent, item, branch ), m_isProjectFile( false ) + FileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch ) + : KFileTreeViewItem( tqparent, item, branch ), m_isProjectFile( false ) { hideOrShow(); } virtual ~FileTreeViewItem() {} public: - virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ); + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ); FileTreeWidget* listView() const; void hideOrShow(); bool isProjectFile() const { return m_isProjectFile; } diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp index 02b7be86..a35d1a6d 100644 --- a/parts/fileview/filetreeviewwidgetimpl.cpp +++ b/parts/fileview/filetreeviewwidgetimpl.cpp @@ -30,9 +30,9 @@ using namespace filetreeview; // class FileTreeViewWidgetImpl /////////////////////////////////////////////////////////////////////////////// -FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *parent, const char *name ) - : TQObject( parent, name ), m_branchItemFactory( 0 ), - m_part( parent->part() ), m_isReloadingTree( false ) +FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *tqparent, const char *name ) + : TQObject( tqparent, name ), m_branchItemFactory( 0 ), + m_part( tqparent->part() ), m_isReloadingTree( false ) { kdDebug(9017) << "FileTreeViewWidgetImpl::FileTreeViewWidgetImpl()" << endl; @@ -63,7 +63,7 @@ FileTreeViewWidgetImpl::~FileTreeViewWidgetImpl() FileTreeWidget *FileTreeViewWidgetImpl::fileTree() const { - return static_cast( parent() ); + return static_cast( TQT_TQWIDGET(tqparent()) ); } /////////////////////////////////////////////////////////////////////////////// @@ -97,7 +97,7 @@ void FileTreeViewWidgetImpl::fillPopupMenu( TQPopupMenu *popupMenu, TQListViewIt if (item == fileTree()->firstChild() && canReloadTree()) { int id = popupMenu->insertItem( i18n( "Reload Tree"), this, TQT_SLOT( slotReloadTree() ) ); - popupMenu->setWhatsThis( id, i18n("Reload tree

Reloads the project files tree.") ); + popupMenu->tqsetWhatsThis( id, i18n("Reload tree

Reloads the project files tree.") ); } m_actionToggleShowNonProjectFiles->plug( popupMenu ); diff --git a/parts/fileview/filetreeviewwidgetimpl.h b/parts/fileview/filetreeviewwidgetimpl.h index 621452b4..34f19ca3 100644 --- a/parts/fileview/filetreeviewwidgetimpl.h +++ b/parts/fileview/filetreeviewwidgetimpl.h @@ -36,11 +36,12 @@ class TQPopupMenu; * A base class for providing additional features to the standard KFileTreeViewItem-based widget we * use for listing files in project directory. */ -class FileTreeViewWidgetImpl : public QObject +class FileTreeViewWidgetImpl : public TQObject { Q_OBJECT + TQ_OBJECT public: - FileTreeViewWidgetImpl( FileTreeWidget *parent, const char *name ); + FileTreeViewWidgetImpl( FileTreeWidget *tqparent, const char *name ); virtual ~FileTreeViewWidgetImpl(); //! return a list containing the filenames of the currently selected items. diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp index f5aa0ff4..a21ba427 100644 --- a/parts/fileview/filetreewidget.cpp +++ b/parts/fileview/filetreewidget.cpp @@ -51,8 +51,8 @@ using namespace filetreeview; // class FileTreeWidget /////////////////////////////////////////////////////////////////////////////// -FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider ) - : KFileTreeView( parent, "filetreewidget" ), m_part( part ), m_rootBranch( 0 ) +FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *tqparent, KDevVCSFileInfoProvider *infoProvider ) + : KFileTreeView( tqparent, "filetreewidget" ), m_part( part ), m_rootBranch( 0 ) { kdDebug(9017) << "Requested FileTree for: " << projectDirectory() << endl; if (versionControl() && infoProvider) @@ -234,7 +234,7 @@ TQString FileTreeWidget::projectDirectory() */ bool FileTreeWidget::isInProject(const TQString &fileName) const { - return m_projectFiles.contains(fileName); + return m_projectFiles.tqcontains(fileName); } /////////////////////////////////////////////////////////////////////////////// @@ -262,10 +262,10 @@ void FileTreeWidget::addProjectFiles( TQStringList const & fileList, bool constr continue; kdDebug(9017) << "adding file: " << *it << endl; const TQString file = projectDirectory() + "/" + ( *it ); - if ( !m_projectFiles.contains( file ) ) + if ( !m_projectFiles.tqcontains( file ) ) { // We got a new file to add to this project. - // Ensure all the parent directories are part of the project set, too. + // Ensure all the tqparent directories are part of the project set, too. TQStringList paths = TQStringList::split( "/", *it); paths.pop_back(); while( !paths.isEmpty() ) @@ -273,10 +273,10 @@ void FileTreeWidget::addProjectFiles( TQStringList const & fileList, bool constr // We are adding the directories from longest (the one containing our file), // to the shortest, measured from root directory of our project. // Whenever we find out that a directory is already recorded as part of our project, - // we may stop adding, because its parent directories were already added - + // we may stop adding, because its tqparent directories were already added - // in some previous addition. TQString joinedPaths = paths.join("/"); - if( m_projectFiles.contains( joinedPaths ) ) + if( m_projectFiles.tqcontains( joinedPaths ) ) break; m_projectFiles.insert( projectDirectory() + "/" + joinedPaths, true ); paths.pop_back(); diff --git a/parts/fileview/filetreewidget.h b/parts/fileview/filetreewidget.h index f9608029..f7a7ac51 100644 --- a/parts/fileview/filetreewidget.h +++ b/parts/fileview/filetreewidget.h @@ -47,8 +47,9 @@ class KDevVersionControl; class FileTreeWidget : public KFileTreeView { Q_OBJECT + TQ_OBJECT public: - FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider ); + FileTreeWidget( FileViewPart *part, TQWidget *tqparent, KDevVCSFileInfoProvider *infoProvider ); virtual ~FileTreeWidget(); void openDirectory(const TQString &dirName); diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp index 0e3758c9..c5d0655a 100644 --- a/parts/fileview/fileviewpart.cpp +++ b/parts/fileview/fileviewpart.cpp @@ -57,8 +57,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) ) // class FileTreeWidget /////////////////////////////////////////////////////////////////////////////// -FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "FileViewPart"), +FileViewPart::FileViewPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(&data, tqparent, name ? name : "FileViewPart"), m_widget( 0 ) { setInstance( FileViewFactory::instance() ); diff --git a/parts/fileview/fileviewpart.h b/parts/fileview/fileviewpart.h index 01f84d32..985d15ed 100644 --- a/parts/fileview/fileviewpart.h +++ b/parts/fileview/fileviewpart.h @@ -24,9 +24,10 @@ class KDevVersionControl; class FileViewPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - FileViewPart( TQObject *parent, const char *name, const TQStringList & ); + FileViewPart( TQObject *tqparent, const char *name, const TQStringList & ); virtual ~FileViewPart(); //! Colors to use for VCS visual feed-back diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp index db921fb1..040f6312 100644 --- a/parts/fileview/partwidget.cpp +++ b/parts/fileview/partwidget.cpp @@ -34,11 +34,11 @@ // class PartWidget /////////////////////////////////////////////////////////////////////////////// -PartWidget::PartWidget( FileViewPart *part, TQWidget *parent ) - : TQVBox( parent, "fileviewpartwidget" ), m_filetree( 0 ), +PartWidget::PartWidget( FileViewPart *part, TQWidget *tqparent ) + : TQVBox( tqparent, "fileviewpartwidget" ), m_filetree( 0 ), m_filter( 0 ), m_btnFilter( 0 ), m_part( part ) { - Q_ASSERT( part && parent ); + Q_ASSERT( part && tqparent ); KDevVCSFileInfoProvider *infoProvider = 0; if (part && part->versionControl() && part->versionControl()->fileInfoProvider()) @@ -50,14 +50,14 @@ PartWidget::PartWidget( FileViewPart *part, TQWidget *parent ) m_filetree->setIcon(SmallIcon("folder")); TQWhatsThis::add(m_filetree, i18n("File tree

" "The file viewer shows all files of the project " - "in a tree layout.")); + "in a tree tqlayout.")); TQHBox* filterBox = new TQHBox( this ); m_btnFilter = new TQToolButton( filterBox ); m_btnFilter->setIconSet( SmallIconSet("filter" ) ); m_btnFilter->setToggleButton( true ); m_filter = new KHistoryCombo( true, filterBox, "filter"); - m_filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + m_filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(m_filter, 2); connect( m_btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBtnFilterClick() ) ); @@ -100,8 +100,8 @@ void PartWidget::slotFilterChange( const TQString & nf ) bool empty = f.isEmpty() || f == "*"; if ( empty ) { - m_filter->lineEdit()->setText( TQString::null ); - TQToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").arg( m_lastFilter ) ); + m_filter->lineEdit()->setText( TQString() ); + TQToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").tqarg( m_lastFilter ) ); } else { @@ -127,7 +127,7 @@ void PartWidget::slotBtnFilterClick() { if ( !m_btnFilter->isOn() ) { - slotFilterChange( TQString::null ); + slotFilterChange( TQString() ); } else { diff --git a/parts/fileview/partwidget.h b/parts/fileview/partwidget.h index 03090e2b..66c57228 100644 --- a/parts/fileview/partwidget.h +++ b/parts/fileview/partwidget.h @@ -16,11 +16,12 @@ class FileViewPart; -class PartWidget : public QVBox +class PartWidget : public TQVBox { Q_OBJECT + TQ_OBJECT public: - PartWidget( FileViewPart *part, TQWidget *parent = 0 ); + PartWidget( FileViewPart *part, TQWidget *tqparent = 0 ); virtual ~PartWidget(); class FileTreeWidget *m_filetree; diff --git a/parts/fileview/stdfiletreewidgetimpl.cpp b/parts/fileview/stdfiletreewidgetimpl.cpp index 67a8da28..943f8850 100644 --- a/parts/fileview/stdfiletreewidgetimpl.cpp +++ b/parts/fileview/stdfiletreewidgetimpl.cpp @@ -23,10 +23,10 @@ class StdFileTreeViewItem : public filetreeview::FileTreeViewItem { public: - StdFileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch, bool pf ) - : FileTreeViewItem( parent, item, branch, pf ) {} - StdFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch ) - : FileTreeViewItem( parent, item, branch ) {} + StdFileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch, bool pf ) + : FileTreeViewItem( tqparent, item, branch, pf ) {} + StdFileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch ) + : FileTreeViewItem( tqparent, item, branch ) {} }; /////////////////////////////////////////////////////////////////////////////// @@ -39,22 +39,22 @@ public: StdFileTreeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix ) : FileTreeBranchItem( view, url, name, pix ) {} virtual ~StdFileTreeBranchItem() {} - virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem ); + virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem ); }; /////////////////////////////////////////////////////////////////////////////// -KFileTreeViewItem* StdFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem ) +KFileTreeViewItem* StdFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem ) { - if (!parent || !fileItem) + if (!tqparent || !fileItem) return 0; - FileTreeWidget *lv = static_cast( parent )->listView(); + FileTreeWidget *lv = static_cast( tqparent )->listView(); const KURL fileURL = fileItem->url(); const bool isDirectory = lv->isInProject( fileURL.path() ); - return new StdFileTreeViewItem( parent, fileItem, this, isDirectory ); + return new StdFileTreeViewItem( tqparent, fileItem, this, isDirectory ); } /////////////////////////////////////////////////////////////////////////////// @@ -74,14 +74,14 @@ public: // class StdFileTreeWidgetImpl /////////////////////////////////////////////////////////////////////////////// -StdFileTreeWidgetImpl::StdFileTreeWidgetImpl( FileTreeWidget *parent ) - : FileTreeViewWidgetImpl( parent, "stdfiletreewidgetimpl" ) +StdFileTreeWidgetImpl::StdFileTreeWidgetImpl( FileTreeWidget *tqparent ) + : FileTreeViewWidgetImpl( tqparent, "stdfiletreewidgetimpl" ) { kdDebug(9017) << "StdFileTreeWidgetImpl::StdFileTreeWidgetImpl()" << endl; setBranchItemFactory( new StdBranchItemFactory ); - parent->addColumn( TQString::null ); + tqparent->addColumn( TQString() ); header()->hide(); } diff --git a/parts/fileview/stdfiletreewidgetimpl.h b/parts/fileview/stdfiletreewidgetimpl.h index a9ba7159..260d2372 100644 --- a/parts/fileview/stdfiletreewidgetimpl.h +++ b/parts/fileview/stdfiletreewidgetimpl.h @@ -23,8 +23,9 @@ class StdFileTreeWidgetImpl : public FileTreeViewWidgetImpl { Q_OBJECT + TQ_OBJECT public: - StdFileTreeWidgetImpl( FileTreeWidget *parent ); + StdFileTreeWidgetImpl( FileTreeWidget *tqparent ); virtual ~StdFileTreeWidgetImpl(); /* diff --git a/parts/fileview/vcscolorsconfigwidget.cpp b/parts/fileview/vcscolorsconfigwidget.cpp index 63067c04..117955d5 100644 --- a/parts/fileview/vcscolorsconfigwidget.cpp +++ b/parts/fileview/vcscolorsconfigwidget.cpp @@ -51,8 +51,8 @@ VCSColors &VCSColors::operator=( const VCSColors &others ) /////////////////////////////////////////////////////////////////////////////// VCSColorsConfigWidget::VCSColorsConfigWidget(FileViewPart *part, const VCSColors &vcsColors, - TQWidget* parent, const char* name, WFlags fl) - : VCSColorsConfigWidgetBase( parent, name, fl ), m_part( part ) + TQWidget* tqparent, const char* name, WFlags fl) + : VCSColorsConfigWidgetBase( tqparent, name, fl ), m_part( part ) { setColors( vcsColors ); } diff --git a/parts/fileview/vcscolorsconfigwidget.h b/parts/fileview/vcscolorsconfigwidget.h index b86038fa..61d1b0e7 100644 --- a/parts/fileview/vcscolorsconfigwidget.h +++ b/parts/fileview/vcscolorsconfigwidget.h @@ -37,10 +37,11 @@ struct VCSColors class VCSColorsConfigWidget : public VCSColorsConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: VCSColorsConfigWidget( FileViewPart *part, const VCSColors &vcsColors, - TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); virtual ~VCSColorsConfigWidget(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/parts/fileview/vcscolorsconfigwidgetbase.ui b/parts/fileview/vcscolorsconfigwidgetbase.ui index 7e7998ce..51f93a11 100644 --- a/parts/fileview/vcscolorsconfigwidgetbase.ui +++ b/parts/fileview/vcscolorsconfigwidgetbase.ui @@ -1,6 +1,6 @@ VCSColorsConfigWidgetBase - + VCSColorsConfigWidgetBase @@ -19,7 +19,7 @@ unnamed - + groupBox1 @@ -30,7 +30,7 @@ unnamed - + textLabel2 @@ -49,7 +49,7 @@ fileUpdatedColorCombo - + textLabel3 @@ -68,7 +68,7 @@ fileModifiedColorCombo - + textLabel4 @@ -87,7 +87,7 @@ fileConflictColorCombo - + textLabel1 @@ -106,7 +106,7 @@ fileAddedColorCombo - + textLabel5 @@ -125,7 +125,7 @@ fileStickyColorCombo - + textLabel5_3 @@ -144,7 +144,7 @@ fileStickyColorCombo - + textLabel5_2 @@ -163,7 +163,7 @@ fileStickyColorCombo - + textLabel6 @@ -182,7 +182,7 @@ fileUnknownColorCombo - + textLabel6_2 @@ -252,7 +252,7 @@ - + kcolorcombo.h kcolorcombo.h diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp index 131c2b4f..a513a1ae 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.cpp +++ b/parts/fileview/vcsfiletreewidgetimpl.cpp @@ -42,16 +42,16 @@ using namespace filetreeview; class VCSFileTreeViewItem : public filetreeview::FileTreeViewItem { public: - VCSFileTreeViewItem( KFileTreeViewItem* parent, KFileItem* item, KFileTreeBranch* branch, bool pf ) - : FileTreeViewItem( parent, item, branch, pf ), m_statusColor( &FileViewPart::vcsColors.unknown ) {} - VCSFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch ) - : FileTreeViewItem( parent, item, branch ), m_statusColor( &FileViewPart::vcsColors.unknown ) {} - virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ) + VCSFileTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* item, KFileTreeBranch* branch, bool pf ) + : FileTreeViewItem( tqparent, item, branch, pf ), m_statusColor( &FileViewPart::vcsColors.unknown ) {} + VCSFileTreeViewItem( KFileTreeView* tqparent, KFileItem* item, KFileTreeBranch* branch ) + : FileTreeViewItem( tqparent, item, branch ), m_statusColor( &FileViewPart::vcsColors.unknown ) {} + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment ) { // paint cell in a different color depending on VCS state TQColorGroup mycg( cg ); mycg.setColor( TQColorGroup::Base, *m_statusColor ); - FileTreeViewItem::paintCell( p, mycg, column, width, alignment ); + FileTreeViewItem::paintCell( p, mycg, column, width, tqalignment ); } void setVCSInfo( const VCSFileInfo &info ); @@ -62,7 +62,7 @@ public: void setFileName( const TQString &p ) { setText( FILENAME_COLUMN, p ); } void setWorkingRev( const TQString &p ) { setText( WORKREVISION_COLUMN, p ); } void setRepositoryRev( const TQString &p ) { setText( REPOREVISION_COLUMN, p ); } - void setStatus( const VCSFileInfo::FileState status ); + void settqStatus( const VCSFileInfo::FileState status ); private: TQColor *m_statusColor; // cached @@ -75,12 +75,12 @@ void VCSFileTreeViewItem::setVCSInfo( const VCSFileInfo &info ) //setFileName( info.fileName ); setRepositoryRev( info.repoRevision ); setWorkingRev( info.workRevision ); - setStatus( info.state ); + settqStatus( info.state ); } /////////////////////////////////////////////////////////////////////////////// -void VCSFileTreeViewItem::setStatus( const VCSFileInfo::FileState status ) +void VCSFileTreeViewItem::settqStatus( const VCSFileInfo::FileState status ) { setText( STATUS_COLUMN, VCSFileInfo::state2String( status ) ); // Update color too @@ -130,7 +130,7 @@ public: KDevVCSFileInfoProvider *vcsInfoProvider ) : FileTreeBranchItem( view, url, name, pix ), m_vcsInfoProvider( vcsInfoProvider ) {} // virtual ~VCSFileTreeBranchItem() {} - virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem ); + virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem ); private: KDevVCSFileInfoProvider *m_vcsInfoProvider; @@ -138,24 +138,24 @@ private: /////////////////////////////////////////////////////////////////////////////// -KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem ) +KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* tqparent, KFileItem* fileItem ) { // kdDebug(9017) << "MyFileTreeBranch::createTreeViewItem(): " + fileItem->url().path() << endl; - if (!parent || !fileItem) + if (!tqparent || !fileItem) return 0; - FileTreeWidget *lv = static_cast( parent )->listView(); + FileTreeWidget *lv = static_cast( tqparent )->listView(); const KURL fileURL = fileItem->url(); const bool isDirectory = lv->isInProject( fileURL.path() ); - VCSFileTreeViewItem *newItem = new VCSFileTreeViewItem( parent, fileItem, this, isDirectory ); + VCSFileTreeViewItem *newItem = new VCSFileTreeViewItem( tqparent, fileItem, this, isDirectory ); // TQString fileName = fileURL.fileName(); // TQString dirName = URLUtil::extractPathNameRelative( lv->projectDirectory(), fileURL.directory() ); // const VCSFileInfoMap &vcsFiles = *m_vcsInfoProvider->status( dirName ); // kdDebug(9017) << "Dir has " << vcsFiles.count() << " registered files!" << endl; -// if (vcsFiles.contains( fileName )) +// if (vcsFiles.tqcontains( fileName )) // newItem->setVCSInfo( vcsFiles[ fileName ] ); // else // kdDebug(9017) << "!!!No VCS info for this file!!!" << endl; @@ -182,8 +182,8 @@ private: // class VCSFileTreeWidgetImpl /////////////////////////////////////////////////////////////////////////////// -VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider ) - : FileTreeViewWidgetImpl( parent, "vcsfiletreewidgetimpl" ), +VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *tqparent, KDevVCSFileInfoProvider *infoProvider ) + : FileTreeViewWidgetImpl( tqparent, "vcsfiletreewidgetimpl" ), m_actionToggleShowVCSFields( 0 ), m_actionSyncWithRepository( 0 ), m_vcsInfoProvider( infoProvider ), m_isSyncingWithRepository( false ), m_vcsStatusRequestedItem( 0 ) { @@ -193,10 +193,10 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFil setBranchItemFactory( new VCSBranchItemFactory( m_vcsInfoProvider ) ); // Update the #define order on top if you change this order! - parent->addColumn( "Filename" ); - parent->addColumn( "Status" ); - parent->addColumn( "Work" ); - parent->addColumn( "Repo" ); + tqparent->addColumn( "Filename" ); + tqparent->addColumn( "tqStatus" ); + tqparent->addColumn( "Work" ); + tqparent->addColumn( "Repo" ); connect( m_vcsInfoProvider, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void *)), this, TQT_SLOT(vcsDirStatusReady(const VCSFileInfoMap&, void*)) ); @@ -218,7 +218,7 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFil TQDomDocument &dom = projectDom(); m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/kdevfileview/tree/showvcsfields") ); slotToggleShowVCSFields( showVCSFields() ); // show or hide fields depending on read settings - connect( parent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*))); + connect( tqparent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*))); } /////////////////////////////////////////////////////////////////////////////// @@ -308,7 +308,7 @@ void VCSFileTreeWidgetImpl::vcsDirStatusReady( const VCSFileInfoMap &modifiedFil { const TQString fileName = item->fileName(); kdDebug(9017) << "Widget item filename is: " << fileName << endl; - if (modifiedFiles.contains( fileName )) + if (modifiedFiles.tqcontains( fileName )) { const VCSFileInfo &vcsInfo = modifiedFiles[ fileName ]; kdDebug(9017) << "Nice! Found info for this file: " << vcsInfo.toString() << endl; @@ -331,7 +331,7 @@ void VCSFileTreeWidgetImpl::slotSyncWithRepository() const VCSFileTreeViewItem *myFileItem = static_cast( m_vcsStatusRequestedItem ); const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), myFileItem->fileItem()->url().path() ); kdDebug(9017) << "VCS Info requested for: " << relDirPath << endl; - m_vcsInfoProvider->requestStatus( relDirPath, m_vcsStatusRequestedItem ); + m_vcsInfoProvider->requesttqStatus( relDirPath, m_vcsStatusRequestedItem ); m_isSyncingWithRepository = true; } @@ -344,7 +344,7 @@ void VCSFileTreeWidgetImpl::slotDirectoryExpanded( TQListViewItem* aItem ) const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), item->fileItem()->url().path() ); kdDebug(9017) << "ASync VCS Info requested for: " << relDirPath << endl; - m_vcsInfoProvider->requestStatus( relDirPath, item, false, false ); + m_vcsInfoProvider->requesttqStatus( relDirPath, item, false, false ); // m_isSyncingWithRepository = true; diff --git a/parts/fileview/vcsfiletreewidgetimpl.h b/parts/fileview/vcsfiletreewidgetimpl.h index 7a6761a9..b88766a5 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.h +++ b/parts/fileview/vcsfiletreewidgetimpl.h @@ -25,8 +25,9 @@ class KToggleAction; class VCSFileTreeWidgetImpl : public FileTreeViewWidgetImpl { Q_OBJECT + TQ_OBJECT public: - VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider ); + VCSFileTreeWidgetImpl( FileTreeWidget *tqparent, KDevVCSFileInfoProvider *infoProvider ); virtual ~VCSFileTreeWidgetImpl(); /* -- cgit v1.2.3