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 --- buildtools/autotools/autodetailsview.cpp | 58 ++++++++++++++++---------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'buildtools/autotools/autodetailsview.cpp') diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index d3cf3864..7002b7c8 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -15,7 +15,7 @@ #include "autodetailsview.h" -/** Qt */ +/** TQt */ #include #include #include @@ -57,8 +57,8 @@ #include "subclassesdlg.h" -AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *parent, const char *name) - : AutoProjectViewBase(parent, name) +AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* part, TQWidget *tqparent, const char *name) + : AutoProjectViewBase(tqparent, name) { m_widget = widget; m_part = part; @@ -71,7 +71,7 @@ AutoDetailsView::AutoDetailsView(AutoProjectWidget* widget, AutoProjectPart* par m_listView->setAllColumnsShowFocus( true ); m_listView->setRootIsDecorated( true ); m_listView->setResizeMode( TQListView::LastColumn ); - m_listView->addColumn( TQString::null ); + m_listView->addColumn( TQString() ); m_listView->header()->hide(); targetOptionsAction->setEnabled( false ); addNewFileAction->setEnabled( false ); @@ -126,7 +126,7 @@ void AutoDetailsView::slotSelectionChanged( TQListViewItem* item ) if ( pvitem->type() == ProjectItem::File ) { - titem = static_cast ( pvitem->parent() ); + titem = static_cast ( pvitem->tqparent() ); TQString primary = titem->primary; if ( primary == "PROGRAMS" || primary == "LIBRARIES" || @@ -177,7 +177,7 @@ void AutoDetailsView::initActions() KActionCollection * actions = new KActionCollection( this ); targetOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0, - this, TQT_SLOT( slotTargetOptions() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotTargetOptions() ), actions, "target options" ); targetOptionsAction->setWhatsThis(i18n("Options

Target options dialog that " "provides settings for linker flags and lists " @@ -188,7 +188,7 @@ void AutoDetailsView::initActions() TQToolTip::add( m_button1, tr2i18n( "Create New File..." ) ); addNewFileAction = new AutoToolsAction( i18n( "Create New File..." ), "filenew", 0, - this, TQT_SLOT( slotAddNewFile() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotAddNewFile() ), actions, "add new file" ); addNewFileAction->setWhatsThis(i18n("Create new file

Creates a new file and " "adds it to a currently selected target.")); @@ -197,7 +197,7 @@ void AutoDetailsView::initActions() TQToolTip::add( m_button2, tr2i18n( "Add Existing Files..." ) ); addExistingFileAction = new AutoToolsAction( i18n( "Add Existing Files..." ), "fileimport", 0, - this, TQT_SLOT( slotAddExistingFile() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotAddExistingFile() ), actions, "add existing file" ); addExistingFileAction->setWhatsThis(i18n("Add existing files

Adds existing " "file to a currently selected target. Header " @@ -208,12 +208,12 @@ void AutoDetailsView::initActions() addExistingFileAction->setEnabled( false ); addIconAction = new KAction( i18n( "Add Icon..." ), "iconadd_kdevelop", 0, - this, TQT_SLOT( slotAddIcon() ), actions, "add icon" ); + TQT_TQOBJECT(this), TQT_SLOT( slotAddIcon() ), actions, "add icon" ); addIconAction->setWhatsThis(i18n("Add icon

Adds an icon to a KDEICON target.")); TQToolTip::add( m_button4, tr2i18n( "Build Target")); buildTargetAction = new AutoToolsAction( i18n( "Build Target..." ), "launch", 0, - this, TQT_SLOT( slotBuildTarget() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotBuildTarget() ), actions, "build target" ); buildTargetAction->setWhatsThis(i18n("Build target

Constructs a series of " "make commands to build the selected target. " @@ -223,7 +223,7 @@ void AutoDetailsView::initActions() TQToolTip::add( m_button5, tr2i18n( "Execute Target...")); executeTargetAction = new AutoToolsAction( i18n( "Execute Target..." ), "exec", 0, - this, TQT_SLOT( slotExecuteTarget() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotExecuteTarget() ), actions, "execute target" ); executeTargetAction->setWhatsThis(i18n("Execute target

Executes the target " "and tries to build in case it is not built.")); @@ -231,7 +231,7 @@ void AutoDetailsView::initActions() executeTargetAction->setEnabled( false ); setActiveTargetAction = new KAction( i18n( "Make Target Active" ), "", 0, - this, TQT_SLOT( slotSetActiveTarget() ), actions, + TQT_TQOBJECT(this), TQT_SLOT( slotSetActiveTarget() ), actions, "set active target" ); setActiveTargetAction->setWhatsThis(i18n("Make target active

Marks the " "currently selected target as 'active'. New " @@ -241,7 +241,7 @@ void AutoDetailsView::initActions() "command builds it.")); TQToolTip::add( m_button3, tr2i18n( "Remove")); - removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "editdelete", 0, this, + removeDetailAction = new AutoToolsAction( i18n( "Remove" ), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveDetail() ), actions, "remove detail" ); removeDetailAction->setWhatsThis(i18n("Remove

Shows a list of targets " @@ -269,7 +269,7 @@ TQString AutoDetailsView::getUiFileLink(const TQString& relpath, const TQString& return (*it).second; } - return TQString::null; + return TQString(); } void AutoDetailsView::slotTargetOptions() @@ -298,7 +298,7 @@ void AutoDetailsView::slotAddNewFile() if (createFileSupport) { KDevCreateFile::CreatedFile crFile = - createFileSupport->createNewFile(TQString::null, + createFileSupport->createNewFile(TQString(), m_widget->selectedSubproject()->path); /* if (crFile.status == KDevCreateFile::CreatedFile::STATUS_OK) { @@ -365,7 +365,7 @@ void AutoDetailsView::slotBuildTarget() TargetItem* titem = 0; if ( pvitem->type() == ProjectItem::File ) - titem = static_cast ( pvitem->parent() ); + titem = static_cast ( pvitem->tqparent() ); else titem = static_cast ( m_listView->selectedItem() ); @@ -383,7 +383,7 @@ void AutoDetailsView::slotExecuteTarget() TargetItem* titem = 0; if ( pvitem->type() == ProjectItem::File ) - titem = static_cast ( pvitem->parent() ); + titem = static_cast ( pvitem->tqparent() ); else titem = static_cast ( m_listView->selectedItem() ); @@ -409,7 +409,7 @@ void AutoDetailsView::slotRemoveDetail() if ( !fitem ) return; - TargetItem *titem = static_cast( fitem->parent() ); + TargetItem *titem = static_cast( fitem->tqparent() ); RemoveFileDialog dlg( m_widget, m_part, m_widget->selectedSubproject(), titem, fitem->text( 0 ), this, "remove file dialog" ); @@ -499,7 +499,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, else caption = titem->name; - KPopupMenu popup( i18n( "Target: %1" ).arg( caption ), this ); + KPopupMenu popup( i18n( "Target: %1" ).tqarg( caption ), this ); if ( titem->primary == "PROGRAMS" || titem->primary == "LIBRARIES" || titem->primary == "LTLIBRARIES" || titem->primary == "JAVA" ) @@ -554,7 +554,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, return; } - KPopupMenu popup( i18n( "File: %1" ).arg( fitem->name ), this ); + KPopupMenu popup( i18n( "File: %1" ).tqarg( fitem->name ), this ); removeDetailAction->plug( &popup ); KURL::List urls; @@ -563,7 +563,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, int idSubclassWidget = popup.insertItem(SmallIconSet("qmake_subclass"), i18n("Subclassing Wizard...") ); - popup.setWhatsThis(idSubclassWidget, i18n("Subclass widget

Launches " + popup.tqsetWhatsThis(idSubclassWidget, i18n("Subclass widget

Launches " "Subclassing wizard. " "It allows to create a subclass from the " "class defined in .ui file. " @@ -572,22 +572,22 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, "class.")); int idUISubclasses = popup.insertItem(SmallIconSet("qmake_subclass"), i18n("List of Subclasses...")); - popup.setWhatsThis(idUISubclasses, i18n("List of subclasses

Shows " + popup.tqsetWhatsThis(idUISubclasses, i18n("List of subclasses

Shows " "subclasses list editor. " "There is possibility to add or remove " "subclasses from the list.")); int idUpdateWidgetclass = popup.insertItem(SmallIconSet("qmake_subclass"), i18n("Edit ui-Subclass...")); - popup.setWhatsThis(idUpdateWidgetclass, i18n("Edit ui-subclass

Launches " + popup.tqsetWhatsThis(idUpdateWidgetclass, i18n("Edit ui-subclass

Launches " "Subclassing wizard and prompts " "to implement missing in childclass " "slots and functions.")); int idViewUIH = popup.insertItem(SmallIconSet("qmake_ui_h"), i18n("Open ui.h File")); - popup.setWhatsThis(idViewUIH, i18n("Open ui.h file

Opens .ui.h file " + popup.tqsetWhatsThis(idViewUIH, i18n("Open ui.h file

Opens .ui.h file " "associated with the selected .ui.")); - if (!fitem->name.contains(TQRegExp("ui$")) || fitem->is_subst == true) + if (!fitem->name.tqcontains(TQRegExp("ui$")) || fitem->is_subst == true) { popup.removeItem(idUISubclasses); popup.removeItem(idViewUIH); @@ -625,7 +625,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, list << DomUtil::Pair(srcfile_relpath,uifile_relpath); DomUtil::writePairListEntry(dom, "/kdevautoproject/subclassing", "subclass", "sourcefile", "uifile", list); - newFileNames[i] = newFileNames[i].replace(TQRegExp(m_part->projectDirectory()+"/"),""); + newFileNames[i] = newFileNames[i].tqreplace(TQRegExp(m_part->projectDirectory()+"/"),""); } m_subclasslist = DomUtil::readPairListEntry(dom,"/kdevautoproject/subclassing", "subclass","sourcefile", "uifile"); @@ -636,13 +636,13 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, { TQString noext = m_widget->selectedSubproject()->path + "/" + fitem->name; - if (noext.findRev('.')>-1) - noext = noext.left(noext.findRev('.')); + if (noext.tqfindRev('.')>-1) + noext = noext.left(noext.tqfindRev('.')); TQStringList dummy; TQString uifile = fitem->uiFileLink; - if (uifile.findRev('/')>-1) + if (uifile.tqfindRev('/')>-1) { TQStringList uisplit = TQStringList::split('/',uifile); uifile=uisplit[uisplit.count()-1]; -- cgit v1.2.3