diff options
Diffstat (limited to 'vcs/cvsservice')
41 files changed, 129 insertions, 153 deletions
diff --git a/vcs/cvsservice/README.dox b/vcs/cvsservice/README.dox index 9887fac9..4a4c5b8c 100644 --- a/vcs/cvsservice/README.dox +++ b/vcs/cvsservice/README.dox @@ -23,7 +23,7 @@ mailing list. Contributions are always welcome :-) Implementation of this component is done by: - class CvsServicePart, which does provide integration within tdevelop, set-up GUI integration, forward cvs commands to the implementation (m_impl). It does also - intercepts Q_SIGNALS like "new files added to project" and "... removed from ...". + intercepts signals like "new files added to project" and "... removed from ...". - class CvsServicePartImpl implements the actual feature: more general speaking functions (like checking for whether files are in repository, provide checks on file lists, ...). @@ -73,7 +73,7 @@ Implementation of this component is done by: \todo Test with SSH repositories! \todo Share a common outputview between VCS: CvsProcessWidget should be reworked :-/ -\todo Additional Q_SLOTS for more complex stuff as status, revert, patch creation, ... +\todo Additional slots for more complex stuff as status, revert, patch creation, ... \faq <b>Does cvsservicepart support login with :pserver: or :ext: ?</b> Well, I dunno ;-) I have no ssh repositories to test so feel free to provide feedback on the subject :-) diff --git a/vcs/cvsservice/annotatedialog.cpp b/vcs/cvsservice/annotatedialog.cpp index ac9f293d..b7cbb749 100644 --- a/vcs/cvsservice/annotatedialog.cpp +++ b/vcs/cvsservice/annotatedialog.cpp @@ -33,8 +33,8 @@ AnnotateDialog::AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent, c TQVBox *vbox = addVBoxPage( i18n("Annotate") ); m_cvsAnnotatePage = new AnnotatePage( m_cvsService, vbox ); - connect( m_cvsAnnotatePage, TQT_SIGNAL(requestAnnotate(const TQString)), - this, TQT_SLOT(slotAnnotate(const TQString)) ); + connect( m_cvsAnnotatePage, TQ_SIGNAL(requestAnnotate(const TQString)), + this, TQ_SLOT(slotAnnotate(const TQString)) ); } AnnotateDialog::~AnnotateDialog() @@ -61,8 +61,8 @@ void AnnotateDialog::slotAnnotate(const TQString rev) AnnotatePage * page = new AnnotatePage( m_cvsService, vbox ); page->startAnnotate(m_pathName, rev); - connect( page, TQT_SIGNAL(requestAnnotate(const TQString)), - this, TQT_SLOT(slotAnnotate(const TQString)) ); + connect( page, TQ_SIGNAL(requestAnnotate(const TQString)), + this, TQ_SLOT(slotAnnotate(const TQString)) ); } #include "annotatedialog.moc" diff --git a/vcs/cvsservice/annotatedialog.h b/vcs/cvsservice/annotatedialog.h index 67218dea..4d6b7f18 100644 --- a/vcs/cvsservice/annotatedialog.h +++ b/vcs/cvsservice/annotatedialog.h @@ -29,7 +29,7 @@ class AnnotatePage; */ class AnnotateDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp index e044db54..9ecf8279 100644 --- a/vcs/cvsservice/annotatepage.cpp +++ b/vcs/cvsservice/annotatepage.cpp @@ -59,10 +59,10 @@ AnnotatePage::AnnotatePage( CvsService_stub *cvsService, TQWidget *parent, const dialogLayout->add( LayoutWidget ); - connect( m_btnAnnotate, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNewAnnotate()) ); - connect( m_leRevision, TQT_SIGNAL( returnPressed() ), - m_btnAnnotate, TQT_SLOT( setFocus() ) ); + connect( m_btnAnnotate, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNewAnnotate()) ); + connect( m_leRevision, TQ_SIGNAL( returnPressed() ), + m_btnAnnotate, TQ_SLOT( setFocus() ) ); //Nest create the AnnotateView; it will do the actual displaying m_annotateView = new AnnotateView(this, "annotateview"); @@ -227,7 +227,7 @@ void AnnotatePage::parseAnnotateOutput(TQStringList& lines) //so we pass it as TQDateTime to the AnnotateView below TQString dateString = line.mid(23, 9); if( !dateString.isEmpty() ) - logDate.setTime_t(KRFCDate::parseDate(dateString), Qt::UTC); + logDate.setTime_t(KRFCDate::parseDate(dateString), TQt::UTC); rev = line.left(13).stripWhiteSpace(); author = line.mid(14, 8).stripWhiteSpace(); diff --git a/vcs/cvsservice/annotatepage.h b/vcs/cvsservice/annotatepage.h index 569ed935..932587f9 100644 --- a/vcs/cvsservice/annotatepage.h +++ b/vcs/cvsservice/annotatepage.h @@ -36,7 +36,7 @@ class KPushButton; */ class AnnotatePage : public TQWidget, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT friend class AnnotateDialog; diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp index 89aa7f01..55f9b8fd 100644 --- a/vcs/cvsservice/annotateview.cpp +++ b/vcs/cvsservice/annotateview.cpp @@ -157,8 +157,8 @@ AnnotateView::AnnotateView(AnnotatePage *parent, const char *name) setSorting(AnnotateViewItem::LineNumberColumn); setColumnAlignment(AnnotateViewItem::LineNumberColumn, TQt::AlignRight); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(itemClicked(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(itemClicked(TQListViewItem*)) ); } diff --git a/vcs/cvsservice/annotateview.h b/vcs/cvsservice/annotateview.h index 6bc97bf2..82741b2e 100644 --- a/vcs/cvsservice/annotateview.h +++ b/vcs/cvsservice/annotateview.h @@ -32,7 +32,7 @@ class AnnotatePage; */ class AnnotateView : public TDEListView, public TQToolTip { - Q_OBJECT + TQ_OBJECT public: diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp index e6bcbd05..c91f8309 100644 --- a/vcs/cvsservice/checkoutdialog.cpp +++ b/vcs/cvsservice/checkoutdialog.cpp @@ -77,10 +77,10 @@ CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService, m_base = new CheckoutDialogBase( this, "checkoutdialogbase" ); setMainWidget( m_base ); - connect( m_base->fetchModulesButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotFetchModulesList()) ); - connect( m_base->modulesListView, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotModuleSelected(TQListViewItem*)) ); + connect( m_base->fetchModulesButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotFetchModulesList()) ); + connect( m_base->modulesListView, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotModuleSelected(TQListViewItem*)) ); // Avoid displaying 'file:/' when displaying the file m_base->workURLRequester->setShowLocalProtocol( false ); diff --git a/vcs/cvsservice/checkoutdialog.h b/vcs/cvsservice/checkoutdialog.h index 51388bc5..9aef6483 100644 --- a/vcs/cvsservice/checkoutdialog.h +++ b/vcs/cvsservice/checkoutdialog.h @@ -29,7 +29,7 @@ class TQListViewItem; */ class CheckoutDialog : public KDialogBase, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT public: CheckoutDialog( CvsService_stub *cvsService, TQWidget *parent = 0, diff --git a/vcs/cvsservice/commitdialogbase.ui b/vcs/cvsservice/commitdialogbase.ui index 12844638..667176f2 100644 --- a/vcs/cvsservice/commitdialogbase.ui +++ b/vcs/cvsservice/commitdialogbase.ui @@ -132,9 +132,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/cvsservice/commitdlg.cpp b/vcs/cvsservice/commitdlg.cpp index f47516ed..206fe754 100644 --- a/vcs/cvsservice/commitdlg.cpp +++ b/vcs/cvsservice/commitdlg.cpp @@ -33,8 +33,8 @@ CommitDialog::CommitDialog( const TQString &changeLogfileNamePath, TQWidget *parent ) : CommitDialogBase( parent, "commitdialog", true ) { - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); setChangeLogFileName( changeLogfileNamePath ); } diff --git a/vcs/cvsservice/commitdlg.h b/vcs/cvsservice/commitdlg.h index c955836f..5d01ff20 100644 --- a/vcs/cvsservice/commitdlg.h +++ b/vcs/cvsservice/commitdlg.h @@ -23,7 +23,7 @@ class TQCheckBox; class CommitDialog : public CommitDialogBase { - Q_OBJECT + TQ_OBJECT public: CommitDialog( const TQString &changeLogfileNamePath, TQWidget *parent = 0 ); diff --git a/vcs/cvsservice/cvsdiffpage.h b/vcs/cvsservice/cvsdiffpage.h index ec3e4f36..4adfbb9c 100644 --- a/vcs/cvsservice/cvsdiffpage.h +++ b/vcs/cvsservice/cvsdiffpage.h @@ -28,7 +28,7 @@ Implementation for the form displaying 'cvs diff' output. */ class CVSDiffPage : public TQWidget, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT public: CVSDiffPage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); diff --git a/vcs/cvsservice/cvsentry.cpp b/vcs/cvsservice/cvsentry.cpp index 79f83deb..c30e15a8 100644 --- a/vcs/cvsservice/cvsentry.cpp +++ b/vcs/cvsservice/cvsentry.cpp @@ -97,7 +97,7 @@ void CVSEntry::parse( const TQString &aLine, const CVSDir& dir ) { TQDateTime date( TQDateTime::fromString( timeStamp() ) ); TQDateTime fileDateUTC; - fileDateUTC.setTime_t( TQFileInfo(dir, fileName()).lastModified().toTime_t(), Qt::UTC ); + fileDateUTC.setTime_t( TQFileInfo(dir, fileName()).lastModified().toTime_t(), TQt::UTC ); if ( date != fileDateUTC ) m_state = Modified; } diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp index 8eb77b71..e71e8a28 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.cpp +++ b/vcs/cvsservice/cvsfileinfoprovider.cpp @@ -35,7 +35,7 @@ CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *parent, CvsService_stu : KDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ), m_requestStatusJob( 0 ), m_cvsService( cvsService ), m_cachedDirEntries( 0 ) { - connect( this, TQT_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQT_SLOT(updateStatusFor(const CVSDir&))); + connect( this, TQ_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQ_SLOT(updateStatusFor(const CVSDir&))); } /////////////////////////////////////////////////////////////////////////////// @@ -146,7 +146,7 @@ void CVSFileInfoProvider::updateStatusFor(const CVSDir& dir) * item conains any childs. Therefor we need to give FileTree some time * to update the directory item before we give the status infos. */ - TQTimer::singleShot( 1000, this, TQT_SLOT(propagateUpdate()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(propagateUpdate()) ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h index 4cc9f4f2..be2ff803 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.h +++ b/vcs/cvsservice/cvsfileinfoprovider.h @@ -30,7 +30,7 @@ Provider for CVS file information */ class CVSFileInfoProvider : public KDevVCSFileInfoProvider, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT public: CVSFileInfoProvider( CvsServicePart *parent, CvsService_stub *cvsService ); diff --git a/vcs/cvsservice/cvsform.h b/vcs/cvsservice/cvsform.h index b8fe6acd..280565cf 100644 --- a/vcs/cvsservice/cvsform.h +++ b/vcs/cvsservice/cvsform.h @@ -20,7 +20,7 @@ information about setting up the cvs repository. */ class CvsForm : public CvsFormBase { - Q_OBJECT + TQ_OBJECT public: CvsForm( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp index 21169346..fb189234 100644 --- a/vcs/cvsservice/cvslogdialog.cpp +++ b/vcs/cvsservice/cvslogdialog.cpp @@ -42,8 +42,8 @@ CVSLogDialog::CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent, const TQVBox *vbox = addVBoxPage( i18n("Log From CVS") ); m_cvsLogPage = new CVSLogPage( m_cvsService, vbox ); - connect( m_cvsLogPage, TQT_SIGNAL(diffRequested(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(slotDiffRequested(const TQString&, const TQString&, const TQString&)) ); + connect( m_cvsLogPage, TQ_SIGNAL(diffRequested(const TQString&, const TQString&, const TQString&)), + this, TQ_SLOT(slotDiffRequested(const TQString&, const TQString&, const TQString&)) ); } /////////////////////////////////////////////////////////////////////////////// @@ -66,8 +66,8 @@ void CVSLogDialog::startLog( const TQString &workDir, const TQString &pathName ) m_cvsLogPage = new CVSLogPage( m_cvsService, vbox ); this->resize( m_cvsLogPage->size() ); - connect( m_cvsLogPage, TQT_SIGNAL(linkClicked(const TQString&, const TQString&)), - this, TQT_SLOT(slotDiffRequested(const TQString&, const TQString&)) ); + connect( m_cvsLogPage, TQ_SIGNAL(linkClicked(const TQString&, const TQString&)), + this, TQ_SLOT(slotDiffRequested(const TQString&, const TQString&)) ); */ m_cvsLogPage->startLog( workDir, pathName ); } diff --git a/vcs/cvsservice/cvslogdialog.h b/vcs/cvsservice/cvslogdialog.h index e3d3614e..6faf8f59 100644 --- a/vcs/cvsservice/cvslogdialog.h +++ b/vcs/cvsservice/cvslogdialog.h @@ -25,7 +25,7 @@ Implementation for the form displaying 'cvs log' output. */ class CVSLogDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp index 4b2d7fb4..756d28d1 100644 --- a/vcs/cvsservice/cvslogpage.cpp +++ b/vcs/cvsservice/cvslogpage.cpp @@ -46,7 +46,7 @@ CVSLogPage::CVSLogPage( CvsService_stub *cvsService, TQWidget *parent, const cha m_textBrowser->setMinimumWidth(fontMetrics().width('X')*50); m_textBrowser->setMinimumHeight(fontMetrics().width('X')*43); - connect( m_textBrowser, TQT_SIGNAL(linkClicked( const TQString& )), this, TQT_SLOT(slotLinkClicked( const TQString& )) ); + connect( m_textBrowser, TQ_SIGNAL(linkClicked( const TQString& )), this, TQ_SLOT(slotLinkClicked( const TQString& )) ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/vcs/cvsservice/cvslogpage.h b/vcs/cvsservice/cvslogpage.h index badfcfd6..63c63a14 100644 --- a/vcs/cvsservice/cvslogpage.h +++ b/vcs/cvsservice/cvslogpage.h @@ -27,7 +27,7 @@ Implementation for the form displaying 'cvs log' output. */ class CVSLogPage : public TQWidget, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT public: CVSLogPage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); diff --git a/vcs/cvsservice/cvsoptionswidget.h b/vcs/cvsservice/cvsoptionswidget.h index dd58797a..5794d22e 100644 --- a/vcs/cvsservice/cvsoptionswidget.h +++ b/vcs/cvsservice/cvsoptionswidget.h @@ -22,7 +22,7 @@ class TQVBoxLayout; class CvsOptionsWidget : public CvsOptionsWidgetBase { - Q_OBJECT + TQ_OBJECT public: CvsOptionsWidget( TQWidget *parent, const char *name=0 ); diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp index 6ded6ecb..ca7c26ab 100644 --- a/vcs/cvsservice/cvspart.cpp +++ b/vcs/cvsservice/cvspart.cpp @@ -96,10 +96,10 @@ CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStri m_impl = new CvsServicePartImpl( this ); // Load / store project configuration every time project is opened/closed - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } /////////////////////////////////////////////////////////////////////////////// @@ -119,15 +119,15 @@ void CvsServicePart::init() setupActions(); // Re-route our implementation signal for when check-out finishes to the standard signal - connect( m_impl, TQT_SIGNAL(checkoutFinished(TQString)), TQT_SIGNAL(finishedFetching(TQString)) ); + connect( m_impl, TQ_SIGNAL(checkoutFinished(TQString)), TQ_SIGNAL(finishedFetching(TQString)) ); // Context menu - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); m_impl->m_widget->setIcon( UserIcon( "kdev_cvs", TDEIcon::DefaultState, CvsFactory::instance()) ); TQWhatsThis::add( m_impl->processWidget(), i18n("<b>CVS</b><p>Concurrent Versions System operations window. Shows output of Cervisia CVS Service.") ); @@ -144,92 +144,92 @@ void CvsServicePart::setupActions() // context at runtime. See CvsServicePart::contextMenu(). actionCommit = new TDEAction( i18n("&Commit to Repository"), 0, this, - TQT_SLOT(slotActionCommit()), actionCollection(), "cvsservice_commit" ); + TQ_SLOT(slotActionCommit()), actionCollection(), "cvsservice_commit" ); actionCommit->setToolTip( i18n("Commit file(s)") ); actionCommit->setWhatsThis( i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.") ); - actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()), + actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQ_SLOT(slotActionDiff()), actionCollection(), "cvsservice_diff" ); actionDiff->setToolTip( i18n("Build difference") ); actionDiff->setWhatsThis( i18n("<b>Build difference</b><p>Builds difference between releases.") ); - actionLog = new TDEAction( i18n("Generate &Log"), 0, this, TQT_SLOT(slotActionLog()), + actionLog = new TDEAction( i18n("Generate &Log"), 0, this, TQ_SLOT(slotActionLog()), actionCollection(), "cvsservice_log" ); actionLog->setToolTip( i18n("Generate log") ); actionLog->setWhatsThis( i18n("<b>Generate log</b><p>Produces log for this file.") ); - actionAnnotate = new TDEAction( i18n("&Annotate"), 0, this, TQT_SLOT(slotActionAnnotate()), + actionAnnotate = new TDEAction( i18n("&Annotate"), 0, this, TQ_SLOT(slotActionAnnotate()), actionCollection(), "cvsservice_annotate" ); actionAnnotate->setToolTip( i18n("Generate annotations") ); actionAnnotate->setWhatsThis( i18n("<b>Annotate</b><p>Produces annotations for this file.") ); - actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), + actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQ_SLOT(slotActionAdd()), actionCollection(), "cvsservice_add" ); actionAdd->setToolTip( i18n("Add file to repository") ); actionAdd->setWhatsThis( i18n("<b>Add to repository</b><p>Adds file to repository.") ); - actionEdit = new TDEAction( i18n("&Edit Files"), 0, this, TQT_SLOT(slotActionEdit()), + actionEdit = new TDEAction( i18n("&Edit Files"), 0, this, TQ_SLOT(slotActionEdit()), actionCollection(), "cvsservice_edit" ); actionEdit->setToolTip( i18n("Mark as being edited") ); actionEdit->setWhatsThis( i18n("<b>Mark as being edited</b><p>Mark the files as being edited.") ); - actionUnEdit = new TDEAction( i18n("&Unedit Files"), 0, this, TQT_SLOT(slotActionUnEdit()), + actionUnEdit = new TDEAction( i18n("&Unedit Files"), 0, this, TQ_SLOT(slotActionUnEdit()), actionCollection(), "cvsservice_unedit" ); actionUnEdit->setToolTip( i18n("Remove editing mark from files") ); actionUnEdit->setWhatsThis( i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files.") ); - actionEditors = new TDEAction( i18n("&Show Editors"), 0, this, TQT_SLOT(slotActionEditors()), + actionEditors = new TDEAction( i18n("&Show Editors"), 0, this, TQ_SLOT(slotActionEditors()), actionCollection(), "cvsservice_editors" ); actionEditors->setToolTip( i18n("Show editors") ); actionEditors->setWhatsThis( i18n("<b>Show editors</b><p>Shows the list of users who are editing files.") ); actionAddBinary = new TDEAction( i18n("Add to Repository as &Binary"), 0, this, - TQT_SLOT(slotActionAddBinary()), actionCollection(), "cvsservice_add_bin" ); + TQ_SLOT(slotActionAddBinary()), actionCollection(), "cvsservice_add_bin" ); actionAddBinary->setToolTip( i18n("Add file to repository as binary") ); actionAddBinary->setWhatsThis( i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option).") ); actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, - TQT_SLOT(slotActionRemove()), actionCollection(), "cvsservice_remove" ); + TQ_SLOT(slotActionRemove()), actionCollection(), "cvsservice_remove" ); actionRemove->setToolTip( i18n("Remove from repository") ); actionRemove->setWhatsThis( i18n("<b>Remove from repository</b><p>Removes file(s) from repository.") ); actionUpdate = new TDEAction( i18n("&Update/Revert to Another Release"), 0, this, - TQT_SLOT(slotActionUpdate()), actionCollection(), "cvsservice_update" ); + TQ_SLOT(slotActionUpdate()), actionCollection(), "cvsservice_update" ); actionUpdate->setToolTip( i18n("Update/revert") ); actionUpdate->setWhatsThis( i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release.") ); actionRemoveSticky = new TDEAction( i18n("R&emove Sticky Flag"), 0, - this, TQT_SLOT(slotActionRemoveSticky()), actionCollection(), "cvsservice_removesticky" ); + this, TQ_SLOT(slotActionRemoveSticky()), actionCollection(), "cvsservice_removesticky" ); actionRemoveSticky->setToolTip( i18n("Remove sticky flag") ); actionRemoveSticky->setWhatsThis( i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s).") ); actionTag = new TDEAction( i18n("Make &Tag/Branch"), 0, - this, TQT_SLOT(slotActionTag()), actionCollection(), "cvsservice_tag" ); + this, TQ_SLOT(slotActionTag()), actionCollection(), "cvsservice_tag" ); actionTag->setToolTip( i18n("Make tag/branch") ); actionTag->setWhatsThis( i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s).") ); actionUnTag = new TDEAction( i18n("&Delete Tag"), 0, - this, TQT_SLOT(slotActionUnTag()), actionCollection(), "cvsservice_untag" ); + this, TQ_SLOT(slotActionUnTag()), actionCollection(), "cvsservice_untag" ); actionUnTag->setToolTip( i18n("Delete tag") ); actionUnTag->setWhatsThis( i18n("<b>Delete tag</b><p>Delete tag from selected file(s).") ); actionAddToIgnoreList = new TDEAction( i18n("&Ignore in CVS Operations"), 0, - this, TQT_SLOT(slotActionAddToIgnoreList()), actionCollection(), "cvsservice_ignore" ); + this, TQ_SLOT(slotActionAddToIgnoreList()), actionCollection(), "cvsservice_ignore" ); actionAddToIgnoreList->setToolTip( i18n("Ignore in CVS operations") ); actionAddToIgnoreList->setWhatsThis( i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file.") ); actionRemoveFromIgnoreList = new TDEAction( i18n("Do &Not Ignore in CVS Operations"), 0, - this, TQT_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "cvsservice_donot_ignore" ); + this, TQ_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "cvsservice_donot_ignore" ); actionRemoveFromIgnoreList->setToolTip( i18n("Do not ignore in CVS operations") ); actionRemoveFromIgnoreList->setWhatsThis( i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file.") ); actionLogin = new TDEAction( i18n("&Log to Server"), 0, this, - TQT_SLOT(slotActionLogin()), actionCollection(), "cvsservice_login" ); + TQ_SLOT(slotActionLogin()), actionCollection(), "cvsservice_login" ); actionLogin->setToolTip( i18n("Login to server") ); actionLogin->setWhatsThis( i18n("<b>Login to server</b><p>Logs in to the CVS server.") ); actionLogout = new TDEAction( i18n("L&ogout From Server"), 0, this, - TQT_SLOT(slotActionLogout()), actionCollection(), "cvsservice_logout" ); + TQ_SLOT(slotActionLogout()), actionCollection(), "cvsservice_logout" ); actionLogout->setToolTip( i18n("Logout from server") ); actionLogout->setWhatsThis( i18n("<b>Logout from server</b><p>Logs out from the CVS server.") ); } @@ -278,7 +278,7 @@ void CvsServicePart::projectConfigWidget( KDialogBase *dlg ) { TQVBox *vbox = dlg->addVBoxPage( i18n("CvsService"), i18n("CvsService"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); CvsOptionsWidget *w = new CvsOptionsWidget( (TQWidget *)vbox, "cvs config widget" ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } /////////////////////////////////////////////////////////////////////////////// @@ -320,45 +320,45 @@ void CvsServicePart::contextMenu( TQPopupMenu *popup, const Context *context ) if (context->hasType( Context::FileContext )) popup->insertSeparator(); - int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) ); + int id = subMenu->insertItem( actionCommit->text(), this, TQ_SLOT(slotCommit()) ); subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.")); // CvsService let to do log and diff operations only on one file (or directory) at time if (m_urls.count() == 1) { - id = subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) ); + id = subMenu->insertItem( actionDiff->text(), this, TQ_SLOT(slotDiff()) ); subMenu->setWhatsThis(id, i18n("<b>Build difference</b><p>Builds difference between releases.")); - id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); + id = subMenu->insertItem( actionLog->text(), this, TQ_SLOT(slotLog()) ); subMenu->setWhatsThis(id, i18n("<b>Generate log</b><p>Produces log for this file.")); - id = subMenu->insertItem( actionAnnotate->text(), this, TQT_SLOT(slotAnnotate()) ); + id = subMenu->insertItem( actionAnnotate->text(), this, TQ_SLOT(slotAnnotate()) ); subMenu->setWhatsThis(id, i18n("<b>Generate Annotate</b><p>Produces annotation output for this file.")); } - id = subMenu->insertItem( actionEditors->text(), this, TQT_SLOT(slotEditors()) ); + id = subMenu->insertItem( actionEditors->text(), this, TQ_SLOT(slotEditors()) ); subMenu->setWhatsThis(id, i18n("<b>Show editors</b><p>Shows the list of users who are editing files.")); - id = subMenu->insertItem( actionEdit->text(), this, TQT_SLOT(slotEdit()) ); + id = subMenu->insertItem( actionEdit->text(), this, TQ_SLOT(slotEdit()) ); subMenu->setWhatsThis(id, i18n("<b>Mark as beeing edited</b><p>Mark the files as beeing edited.")); - id = subMenu->insertItem( actionUnEdit->text(), this, TQT_SLOT(slotUnEdit()) ); + id = subMenu->insertItem( actionUnEdit->text(), this, TQ_SLOT(slotUnEdit()) ); subMenu->setWhatsThis(id, i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files.")); - id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) ); + id = subMenu->insertItem( actionAdd->text(), this, TQ_SLOT(slotAdd()) ); subMenu->setWhatsThis(id, i18n("<b>Add to repository</b><p>Adds file to repository.")); - id = subMenu->insertItem( actionAddBinary->text(), this, TQT_SLOT(slotAddBinary()) ); + id = subMenu->insertItem( actionAddBinary->text(), this, TQ_SLOT(slotAddBinary()) ); subMenu->setWhatsThis(id, i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option).")); - id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotRemove()) ); + id = subMenu->insertItem( actionRemove->text(), this, TQ_SLOT(slotRemove()) ); subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); subMenu->insertSeparator(); - id = subMenu->insertItem( actionTag->text(), this, TQT_SLOT(slotTag()) ); + id = subMenu->insertItem( actionTag->text(), this, TQ_SLOT(slotTag()) ); subMenu->setWhatsThis(id, i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s).")); - id = subMenu->insertItem( actionUnTag->text(), this, TQT_SLOT(slotUnTag()) ); + id = subMenu->insertItem( actionUnTag->text(), this, TQ_SLOT(slotUnTag()) ); subMenu->setWhatsThis(id, i18n("<b>Delete tag</b><p>Delete tag from selected file(s).")); - id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) ); + id = subMenu->insertItem( actionUpdate->text(), this, TQ_SLOT(slotUpdate()) ); subMenu->setWhatsThis(id, i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release.")); - id = subMenu->insertItem( actionRemoveSticky->text(), this, TQT_SLOT(slotRemoveSticky()) ); + id = subMenu->insertItem( actionRemoveSticky->text(), this, TQ_SLOT(slotRemoveSticky()) ); subMenu->setWhatsThis(id, i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s).")); subMenu->insertSeparator(); - id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) ); + id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQ_SLOT(slotAddToIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file.")); - id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); + id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQ_SLOT(slotRemoveFromIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file.")); // Now insert in parent menu @@ -750,8 +750,8 @@ void CvsServicePart::slotProjectOpened() options->load( project() ); // When files are added to project they may be added to/removed from repository too - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } /////////////////////////////////////////////////////////////////////////////// @@ -772,8 +772,8 @@ void CvsServicePart::slotProjectClosed() delete options; // We don't have a project anymore ... - disconnect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - disconnect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + disconnect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + disconnect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } #include "cvspart.moc" diff --git a/vcs/cvsservice/cvspart.h b/vcs/cvsservice/cvspart.h index e2df8ce0..99008dc8 100644 --- a/vcs/cvsservice/cvspart.h +++ b/vcs/cvsservice/cvspart.h @@ -36,7 +36,7 @@ class CvsServicePartImpl; class CvsServicePart : public KDevVersionControl { - Q_OBJECT + TQ_OBJECT friend class CvsServicePartImpl; diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp index 01c85df3..28203e91 100644 --- a/vcs/cvsservice/cvspartimpl.cpp +++ b/vcs/cvsservice/cvspartimpl.cpp @@ -80,7 +80,7 @@ CvsServicePartImpl::CvsServicePartImpl( CvsServicePart *part, const char *name ) m_scheduler = new DirectScheduler( m_widget ); m_fileInfoProvider = new CVSFileInfoProvider( part, m_cvsService ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); } else { @@ -374,7 +374,7 @@ bool CvsServicePartImpl::checkout() modulePath = dlg.workDir() + dlg.module(); m_scheduler->schedule( job ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotCheckoutFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotCheckoutFinished(bool,int)) ); return true; } } @@ -406,7 +406,7 @@ void CvsServicePartImpl::commit( const KURL::List& urlList ) } m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); // 2. if requested to do so, add an entry to the Changelog too if (dlg.mustAddToChangeLog()) @@ -448,7 +448,7 @@ void CvsServicePartImpl::update( const KURL::List& urlList ) additionalOptions ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -465,7 +465,7 @@ void CvsServicePartImpl::add( const KURL::List& urlList, bool binary ) DCOPRef cvsJob = m_cvsService->add( fileList(), binary ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -531,7 +531,7 @@ void CvsServicePartImpl::unedit( const KURL::List& urlList) DCOPRef cvsJob = m_cvsService->unedit( fileList() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -548,7 +548,7 @@ void CvsServicePartImpl::edit( const KURL::List& urlList) DCOPRef cvsJob = m_cvsService->edit( fileList() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -582,8 +582,8 @@ void CvsServicePartImpl::remove( const KURL::List& urlList ) DCOPRef cvsJob = m_cvsService->remove( fileList(), true ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -606,8 +606,8 @@ void CvsServicePartImpl::removeStickyFlag( const KURL::List& urlList ) "-A" ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -656,8 +656,8 @@ void CvsServicePartImpl::diff( const KURL::List& urlList ) } m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotDiffFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotDiffFinished(bool,int)) ); doneOperation(); } @@ -680,8 +680,8 @@ void CvsServicePartImpl::tag( const KURL::List& urlList ) dlg.isBranch(), dlg.force() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -705,8 +705,8 @@ void CvsServicePartImpl::unTag( const KURL::List& urlList ) dlg.isBranch(), dlg.force() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -747,7 +747,7 @@ void CvsServicePartImpl::createNewProject( const TQString &dirName, DCOPRef cvsJob = m_cvsService->import( dirName, location, module, filesToIgnore, message, vendor, release, false ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotCheckoutFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotCheckoutFinished(bool,int)) ); */ TQString rsh_preamble; if ( !options->cvsRshEnvVar().isEmpty() ) diff --git a/vcs/cvsservice/cvspartimpl.h b/vcs/cvsservice/cvspartimpl.h index ade7ffe4..d64ad625 100644 --- a/vcs/cvsservice/cvspartimpl.h +++ b/vcs/cvsservice/cvspartimpl.h @@ -45,7 +45,7 @@ class CvsServicePartImpl : public TQObject { friend class CvsServicePart; - Q_OBJECT + TQ_OBJECT public: //! Available Cvs operations diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp index bb8fb459..87e917a5 100644 --- a/vcs/cvsservice/cvsprocesswidget.cpp +++ b/vcs/cvsservice/cvsprocesswidget.cpp @@ -140,7 +140,7 @@ bool CvsProcessWidget::startJob( const DCOPRef &aJob ) kdDebug(9006) << "Running: " << cmdLine << endl; // disconnect 3rd party slots from our signals - disconnect( TQT_SIGNAL(jobFinished(bool, int)) ); + disconnect( TQ_SIGNAL(jobFinished(bool, int)) ); showInfo( i18n("Started job: %1").arg( cmdLine ) ); diff --git a/vcs/cvsservice/cvsprocesswidget.h b/vcs/cvsservice/cvsprocesswidget.h index c8f9c8af..7a9337f8 100644 --- a/vcs/cvsservice/cvsprocesswidget.h +++ b/vcs/cvsservice/cvsprocesswidget.h @@ -26,7 +26,7 @@ class TQStyleSheetItem; class CvsProcessWidget : public TQTextEdit, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT public: CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, diff --git a/vcs/cvsservice/diffdialog.h b/vcs/cvsservice/diffdialog.h index 28b0c181..b1e630f3 100644 --- a/vcs/cvsservice/diffdialog.h +++ b/vcs/cvsservice/diffdialog.h @@ -22,7 +22,7 @@ */ class DiffDialog : public DiffDialogBase { - Q_OBJECT + TQ_OBJECT public: DiffDialog(const CVSEntry &entry, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); diff --git a/vcs/cvsservice/diffdialogbase.ui b/vcs/cvsservice/diffdialogbase.ui index 97bbd918..06c9b11c 100644 --- a/vcs/cvsservice/diffdialogbase.ui +++ b/vcs/cvsservice/diffdialogbase.ui @@ -201,9 +201,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -218,9 +215,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index 008dc867..1119c6ff 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -75,14 +75,14 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) } if ( !extPartsTranslated.isEmpty() ) popup->insertSeparator( i ); - connect( popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupActivated(int)) ); + connect( popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupActivated(int)) ); - popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQT_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); + popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQ_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); popup->setItemEnabled( POPUP_BASE - 2, length() > 0 ); popup->insertSeparator( 1 ); - popup->insertItem( i18n( "Highlight Syntax" ), this, TQT_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); + popup->insertItem( i18n( "Highlight Syntax" ), this, TQ_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); popup->setItemChecked( POPUP_BASE - 1, _highlight ); popup->insertSeparator( 3 ); @@ -184,7 +184,7 @@ DiffWidget::DiffWidget( TQWidget *parent, const char *name, WFlags f ): te->setReadOnly( true ); te->setTextFormat( TQTextEdit::PlainText ); // te->setMinimumSize( 300, 200 ); - connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) ); + connect( te, TQ_SIGNAL(externalPartRequested(const TQString&)), this, TQ_SLOT(loadExtPart(const TQString&)) ); TQVBoxLayout* layout = new TQVBoxLayout( this ); layout->addWidget( te ); @@ -222,7 +222,7 @@ void DiffWidget::loadExtPart( const TQString& partName ) if ( !extService ) return; - extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, TQT_TQOBJECT(this), 0 ); + extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, this, 0 ); if ( !extPart || !extPart->widget() ) return; @@ -301,10 +301,10 @@ void DiffWidget::openURL( const KURL& url ) if ( !job ) return; - connect( job, TQT_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), - this, TQT_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); - connect( job, TQT_SIGNAL(result( TDEIO::Job * )), - this, TQT_SLOT(slotFinished()) ); + connect( job, TQ_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), + this, TQ_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * )), + this, TQ_SLOT(slotFinished()) ); } void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) @@ -312,7 +312,7 @@ void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) TQPopupMenu* popup = new TQPopupMenu( this ); if ( !te->isVisible() ) - popup->insertItem( i18n("Display &Raw Output"), this, TQT_SLOT(showTextEdit()) ); + popup->insertItem( i18n("Display &Raw Output"), this, TQ_SLOT(showTextEdit()) ); popup->exec( TQCursor::pos() ); delete popup; diff --git a/vcs/cvsservice/diffwidget.h b/vcs/cvsservice/diffwidget.h index 9142aa8a..b14f5860 100644 --- a/vcs/cvsservice/diffwidget.h +++ b/vcs/cvsservice/diffwidget.h @@ -31,7 +31,7 @@ namespace KParts { // Helper class that displays a modified RMB popup menu class KDiffTextEdit: public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: KDiffTextEdit( TQWidget* parent = 0, const char* name = 0 ); @@ -60,7 +60,7 @@ private: class DiffWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/vcs/cvsservice/editorsdialog.h b/vcs/cvsservice/editorsdialog.h index 5bf19b65..86030c14 100644 --- a/vcs/cvsservice/editorsdialog.h +++ b/vcs/cvsservice/editorsdialog.h @@ -21,7 +21,7 @@ class TQStringList; class EditorsDialog: public EditorsDialogBase, virtual public CVSServiceDCOPIface { -Q_OBJECT +TQ_OBJECT public: EditorsDialog(CvsService_stub *cvsService, TQWidget *parent = 0, const char *name = 0); diff --git a/vcs/cvsservice/editorsdialogbase.ui b/vcs/cvsservice/editorsdialogbase.ui index 37af7c1b..7e1fa65f 100644 --- a/vcs/cvsservice/editorsdialogbase.ui +++ b/vcs/cvsservice/editorsdialogbase.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.h b/vcs/cvsservice/integrator/cvsserviceintegrator.h index ebf4224e..70b18751 100644 --- a/vcs/cvsservice/integrator/cvsserviceintegrator.h +++ b/vcs/cvsservice/integrator/cvsserviceintegrator.h @@ -25,7 +25,7 @@ #include <tqstringlist.h> class CVSServiceIntegrator: public KDevVCSIntegrator { -Q_OBJECT +TQ_OBJECT public: CVSServiceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/vcs/cvsservice/integrator/integratordlg.h b/vcs/cvsservice/integrator/integratordlg.h index ac6d7f9d..817fc622 100644 --- a/vcs/cvsservice/integrator/integratordlg.h +++ b/vcs/cvsservice/integrator/integratordlg.h @@ -26,7 +26,7 @@ class TQDomDocument; class IntegratorDlg: public IntegratorDlgBase, public VCSDialog { -Q_OBJECT +TQ_OBJECT public: IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *parent = 0, const char *name = 0); diff --git a/vcs/cvsservice/integrator/integratordlgbase.ui b/vcs/cvsservice/integrator/integratordlgbase.ui index 6660faab..5dc8ae11 100644 --- a/vcs/cvsservice/integrator/integratordlgbase.ui +++ b/vcs/cvsservice/integrator/integratordlgbase.ui @@ -389,11 +389,11 @@ <tabstop>login</tabstop> <tabstop>init</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init_clicked()</slot> <slot>login_clicked()</slot> <slot>createModule_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/vcs/cvsservice/releaseinputdialog.h b/vcs/cvsservice/releaseinputdialog.h index dc5597af..7e4befd2 100644 --- a/vcs/cvsservice/releaseinputdialog.h +++ b/vcs/cvsservice/releaseinputdialog.h @@ -20,7 +20,7 @@ */ class ReleaseInputDialog : public ReleaseInputDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/vcs/cvsservice/releaseinputdialogbase.ui b/vcs/cvsservice/releaseinputdialogbase.ui index 92687fb8..1132e928 100644 --- a/vcs/cvsservice/releaseinputdialogbase.ui +++ b/vcs/cvsservice/releaseinputdialogbase.ui @@ -188,9 +188,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -205,9 +202,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/cvsservice/tagdialog.h b/vcs/cvsservice/tagdialog.h index d912c7ff..f20ab853 100644 --- a/vcs/cvsservice/tagdialog.h +++ b/vcs/cvsservice/tagdialog.h @@ -22,7 +22,7 @@ */ class TagDialog : public TagDialogBase { - Q_OBJECT + TQ_OBJECT public: TagDialog( const TQString &caption, TQWidget *parent = 0, const char *name = 0 ); diff --git a/vcs/cvsservice/tagdialogbase.ui b/vcs/cvsservice/tagdialogbase.ui index dc12e6bc..e5e52848 100644 --- a/vcs/cvsservice/tagdialogbase.ui +++ b/vcs/cvsservice/tagdialogbase.ui @@ -113,9 +113,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -130,9 +127,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> |