From f78eb03afb8c9a380985d26286afc40b4c89b292 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:15:35 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- buildtools/qmake/choosesubprojectdlg.cpp | 4 ++-- buildtools/qmake/choosesubprojectdlg.h | 2 +- buildtools/qmake/choosesubprojectdlgbase.ui | 2 +- buildtools/qmake/disablesubprojectdlgbase.ui | 2 +- buildtools/qmake/projectconfigurationdlg.cpp | 4 ++-- buildtools/qmake/projectconfigurationdlg.h | 4 ++-- buildtools/qmake/projectconfigurationdlgbase.ui | 2 +- buildtools/qmake/trolllistview.cpp | 2 +- buildtools/qmake/trolllistview.h | 2 +- buildtools/qmake/trollprojectpart.cpp | 28 ++++++++++++------------- buildtools/qmake/trollprojectwidget.cpp | 20 +++++++++--------- buildtools/qmake/trollprojectwidget.h | 12 +++++------ 12 files changed, 42 insertions(+), 42 deletions(-) (limited to 'buildtools/qmake') diff --git a/buildtools/qmake/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp index 63da84f8..815a6ef7 100644 --- a/buildtools/qmake/choosesubprojectdlg.cpp +++ b/buildtools/qmake/choosesubprojectdlg.cpp @@ -48,12 +48,12 @@ void ChooseSubprojectDlg::accept() } ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListViewItem * parent, TQString text ) - :KListViewItem(parent, text), m_spitem(spitem) + :TDEListViewItem(parent, text), m_spitem(spitem) { } ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListView * parent, TQString text ) - :KListViewItem(parent, text), m_spitem(spitem) + :TDEListViewItem(parent, text), m_spitem(spitem) { } diff --git a/buildtools/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h index cdddc4dc..18656480 100644 --- a/buildtools/qmake/choosesubprojectdlg.h +++ b/buildtools/qmake/choosesubprojectdlg.h @@ -19,7 +19,7 @@ class QMakeScopeItem; class TrollProjectWidget; -class ChooseItem: public KListViewItem +class ChooseItem: public TDEListViewItem { public: ChooseItem(QMakeScopeItem *spitem, TQListViewItem *parent, TQString text); diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui index f1e2e579..d5f6566d 100644 --- a/buildtools/qmake/choosesubprojectdlgbase.ui +++ b/buildtools/qmake/choosesubprojectdlgbase.ui @@ -86,7 +86,7 @@ - + Subprojects diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui index fadafc04..c1d09af1 100644 --- a/buildtools/qmake/disablesubprojectdlgbase.ui +++ b/buildtools/qmake/disablesubprojectdlgbase.ui @@ -19,7 +19,7 @@ unnamed - + Subprojects diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp index 8f4ffc70..a74b0793 100644 --- a/buildtools/qmake/projectconfigurationdlg.cpp +++ b/buildtools/qmake/projectconfigurationdlg.cpp @@ -85,7 +85,7 @@ void InsideCheckListItem::stateChange( bool state ) } CustomVarListItem::CustomVarListItem(TQListView* parent, unsigned int id, TQMap var) - : KListViewItem(parent), m_key(id) + : TDEListViewItem(parent), m_key(id) { setText(0, var["var"]); setText(1, var["op"]); @@ -96,7 +96,7 @@ TQString CustomVarListItem::key(int column, bool ascending) const { if( column == 0) return TQString::number(m_key); - return KListViewItem::key(column, ascending); + return TDEListViewItem::key(column, ascending); } ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* parent, const char* name, bool modal, WFlags fl ) diff --git a/buildtools/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h index 50014e55..d02ff7e4 100644 --- a/buildtools/qmake/projectconfigurationdlg.h +++ b/buildtools/qmake/projectconfigurationdlg.h @@ -26,7 +26,7 @@ #include class QMakeScopeItem; -class KListViewItem; +class TDEListViewItem; class qProjectItem; class ProjectConfigurationDlg; class TrollProjectWidget; @@ -44,7 +44,7 @@ protected: virtual void stateChange ( bool state ); }; -class CustomVarListItem : public KListViewItem +class CustomVarListItem : public TDEListViewItem { public: CustomVarListItem( TQListView*, unsigned int, TQMap ); diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui index 6f4bf0d9..24bcfeb1 100644 --- a/buildtools/qmake/projectconfigurationdlgbase.ui +++ b/buildtools/qmake/projectconfigurationdlgbase.ui @@ -1895,7 +1895,7 @@ unnamed - + Name diff --git a/buildtools/qmake/trolllistview.cpp b/buildtools/qmake/trolllistview.cpp index 3bf99a0e..4f0e3406 100644 --- a/buildtools/qmake/trolllistview.cpp +++ b/buildtools/qmake/trolllistview.cpp @@ -22,7 +22,7 @@ TrollListView::TrollListView(TrollProjectWidget *widget, TQWidget *parent, TrollProjectWidget::TrollProjectView view, const char *name) - :KListView(parent, name), m_widget(widget), m_view(view) + :TDEListView(parent, name), m_widget(widget), m_view(view) { } diff --git a/buildtools/qmake/trolllistview.h b/buildtools/qmake/trolllistview.h index 4fb005d5..13d2d9a1 100644 --- a/buildtools/qmake/trolllistview.h +++ b/buildtools/qmake/trolllistview.h @@ -24,7 +24,7 @@ #include "trollprojectwidget.h" -class TrollListView : public KListView +class TrollListView : public TDEListView { Q_OBJECT diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 69c030b7..a86be38a 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -88,10 +88,10 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS mainWindow()->embedSelectViewRight(m_widget, i18n("TQMake Manager"), i18n("TQMake manager")); - KAction *action; + TDEAction *action; const TQIconSet icon(SmallIcon("compfile")); - action = new KAction( i18n("Compile &File"), "compfile", 0, + action = new TDEAction( i18n("Compile &File"), "compfile", 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildOpenFile()), actionCollection(),"build_compilefile" ); action->setToolTip(i18n("Compile file")); @@ -100,7 +100,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Build Project"), "make_tdevelop", Key_F8, + action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildProject()), actionCollection(), "build_build_project" ); action->setToolTip(i18n("Build project")); @@ -108,7 +108,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Rebuild Project"),"rebuild" , 0, + action = new TDEAction( i18n("&Rebuild Project"),"rebuild" , 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotRebuildProject()), actionCollection(),"build_rebuild_project" ); action->setToolTip(i18n("Rebuild project")); @@ -116,7 +116,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Install Project"),"install" , 0, + action = new TDEAction( i18n("&Install Project"),"install" , 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotInstallProject()), actionCollection(),"build_install_project" ); action->setToolTip(i18n("Install project")); @@ -124,7 +124,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Clean Project"), 0, + action = new TDEAction( i18n("&Clean Project"), 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotCleanProject()), actionCollection(), "build_clean_project" ); action->setToolTip(i18n("Clean project")); @@ -132,7 +132,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Dist-Clean Project"), 0, + action = new TDEAction( i18n("&Dist-Clean Project"), 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotDistCleanProject()), actionCollection(), "build_distclean_project" ); action->setToolTip(i18n("Dist-Clean project")); @@ -140,13 +140,13 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "project directory.
Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("Execute Main Program"), "exec", SHIFT+Key_F9, + action = new TDEAction( i18n("Execute Main Program"), "exec", SHIFT+Key_F9, this, TQT_SLOT(slotBuildAndExecuteProject()), actionCollection(), "build_execute_project" ); action->setToolTip(i18n("Execute main program")); action->setWhatsThis(i18n("Execute program

Executes the currently selected subproject if it is an application or the program specified in project settings, Run Options tab.")); - action = new KAction( i18n("&Build Subproject"), "make_tdevelop", Key_F7, + action = new TDEAction( i18n("&Build Subproject"), "make_tdevelop", Key_F7, TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildTarget()), actionCollection(), "build_build_target" ); action->setToolTip(i18n("Build subproject")); @@ -155,7 +155,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Rebuild Subproject"), "rebuild", 0, + action = new TDEAction( i18n("&Rebuild Subproject"), "rebuild", 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotRebuildTarget()), actionCollection(),"build_rebuild_target" ); action->setToolTip(i18n("Rebuild subproject")); @@ -164,7 +164,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Install Subproject"), "install", 0, + action = new TDEAction( i18n("&Install Subproject"), "install", 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotInstallTarget()), actionCollection(),"build_install_target" ); action->setToolTip(i18n("Install subproject")); @@ -173,7 +173,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Clean Subproject"), 0, + action = new TDEAction( i18n("&Clean Subproject"), 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotCleanTarget()), actionCollection(), "build_clean_target" ); action->setToolTip(i18n("Clean subproject")); @@ -182,7 +182,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Dist-Clean Subproject"), 0, + action = new TDEAction( i18n("&Dist-Clean Subproject"), 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotDistCleanTarget()), actionCollection(), "build_distclean_target" ); action->setToolTip(i18n("Dist-Clean subproject")); @@ -191,7 +191,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("Execute Subproject"), "exec", 0, + action = new TDEAction( i18n("Execute Subproject"), "exec", 0, this, TQT_SLOT(slotBuildAndExecuteTarget()), actionCollection(), "build_execute_target" ); action->setToolTip(i18n("Execute subproject")); diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 77301f95..69f71bd4 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -177,8 +177,8 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // Project tree connections connect( overview, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), this, TQT_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); - connect( overview, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotOverviewContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( overview, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotOverviewContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); ///////////////// @@ -295,8 +295,8 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) this, TQT_SLOT( slotDetailsSelectionChanged( TQListViewItem* ) ) ); connect( details, TQT_SIGNAL( executed( TQListViewItem* ) ), this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); - connect( details, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotDetailsContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( details, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotDetailsContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); connect ( buildTargetButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildTarget () ) ); connect ( rebuildTargetButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRebuildTarget () ) ); @@ -553,7 +553,7 @@ void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item ) } } -void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl ) +void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, TDEListView *listviewControl ) { // Insert all GroupItems and all of their children into the view @@ -966,14 +966,14 @@ void TrollProjectWidget::slotRemoveSubproject( QMakeScopeItem *spitem ) } } -void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) +void TrollProjectWidget::slotOverviewContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p ) { if ( !item ) return ; QMakeScopeItem *spitem = static_cast( item ); - KPopupMenu popup( this ); + TDEPopupMenu popup( this ); popup.insertTitle( i18n( "Subproject %1" ).arg( item->text( 0 ) ) ); int idBuild = -2; @@ -1516,7 +1516,7 @@ void TrollProjectWidget::slotDetailsSelectionChanged( TQListViewItem *item ) } } -void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) +void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p ) { if ( !item ) return ; @@ -1528,7 +1528,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it TQString title, ext; GroupItem::groupTypeMeanings( titem->groupType, title, ext ); - KPopupMenu popup( this ); + TDEPopupMenu popup( this ); popup.insertTitle( title ); int idInsExistingFile = -2; @@ -1755,7 +1755,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it FileItem *fitem = static_cast( pvitem ); GroupItem* gitem = static_cast( item->parent() ); - KPopupMenu popup( this ); + TDEPopupMenu popup( this ); if ( !( gitem->groupType == GroupItem::InstallObject ) ) popup.insertTitle( i18n( "File: %1" ).arg( fitem->text( 0 ) ) ); else diff --git a/buildtools/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h index 1babd746..fdc6ce74 100644 --- a/buildtools/qmake/trollprojectwidget.h +++ b/buildtools/qmake/trollprojectwidget.h @@ -38,7 +38,7 @@ #include "qmakescopeitem.h" class TrollProjectPart; -class KListView; +class TDEListView; class ProjectConfigurationDlg; class TrollProjectWidget : public TQVBox @@ -127,10 +127,10 @@ protected: private slots: void slotOverviewSelectionChanged( TQListViewItem *item ); - void slotOverviewContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ); + void slotOverviewContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p ); void slotDetailsSelectionChanged( TQListViewItem* ); void slotDetailsExecuted( TQListViewItem *item ); - void slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ); + void slotDetailsContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p ); void slotExcludeFileFromScopeButton(); void slotAddSubproject( QMakeScopeItem *spitem = 0 ); void slotRemoveSubproject( QMakeScopeItem *spitem = 0 ); @@ -144,7 +144,7 @@ private slots: private: void cleanDetailView( QMakeScopeItem *item ); void runClean( QMakeScopeItem*, const TQString& ); - void buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl ); + void buildProjectDetailTree( QMakeScopeItem *item, TDEListView *listviewControl ); void removeFile( QMakeScopeItem *spitem, FileItem *fitem ); void addSubprojectToItem( QMakeScopeItem*, const TQString& ); void setupContext(); @@ -172,7 +172,7 @@ private: TQMap qmakeEnvironment() const; TQVBox *overviewContainer; - KListView *overview; + TDEListView *overview; TQHBox *projectTools; TQToolButton *addSubdirButton; TQToolButton *createScopeButton; @@ -189,7 +189,7 @@ private: TQToolButton *projectconfButton; TQVBox *detailContainer; - KListView *details; + TDEListView *details; TQHBox *fileTools; TQToolButton *addfilesButton; TQToolButton *newfileButton; -- cgit v1.2.1