diff options
Diffstat (limited to 'quanta/components/cvsservice')
-rw-r--r-- | quanta/components/cvsservice/Makefile.am | 2 | ||||
-rw-r--r-- | quanta/components/cvsservice/cvscommitdlgs.ui | 14 | ||||
-rw-r--r-- | quanta/components/cvsservice/cvsservice.cpp | 16 | ||||
-rw-r--r-- | quanta/components/cvsservice/cvsservice.h | 1 | ||||
-rw-r--r-- | quanta/components/cvsservice/cvsupdatetodlgs.ui | 20 |
5 files changed, 28 insertions, 25 deletions
diff --git a/quanta/components/cvsservice/Makefile.am b/quanta/components/cvsservice/Makefile.am index 79429348..eb381581 100644 --- a/quanta/components/cvsservice/Makefile.am +++ b/quanta/components/cvsservice/Makefile.am @@ -1,3 +1,5 @@ +INCLUDES = $(all_includes) -I$(kde_includes)/kde + noinst_LTLIBRARIES = libcvsservice.la libcvsservice_la_SOURCES = cvsservice.cpp cvscommitdlgs.ui \ diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui index ce2c9fd0..a2ce167e 100644 --- a/quanta/components/cvsservice/cvscommitdlgs.ui +++ b/quanta/components/cvsservice/cvscommitdlgs.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2004 Andras Mantia <amantia@kde.org></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>CVSCommitDlgS</cstring> </property> @@ -33,7 +33,7 @@ <cstring>fileList</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -49,7 +49,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -60,7 +60,7 @@ <cstring>messageCombo</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -71,7 +71,7 @@ <cstring>logEdit</cstring> </property> </widget> - <widget class="QTextEdit" row="5" column="0" rowspan="1" colspan="4"> + <widget class="TQTextEdit" row="5" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>logEdit</cstring> </property> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>20</height> @@ -143,7 +143,7 @@ <tabstop>okButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> </includehints> diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp index 4849ea72..33386cb3 100644 --- a/quanta/components/cvsservice/cvsservice.cpp +++ b/quanta/components/cvsservice/cvsservice.cpp @@ -176,11 +176,11 @@ void CVSService::slotUpdateToTag(const TQStringList &files) if (m_updateToDlg->tagRadioButton->isChecked()) { extraOpts = "-r " + m_updateToDlg->tagCombo->currentText(); - commandStr = i18n("Updating to revision %1 ...").arg(m_updateToDlg->tagCombo->currentText()); + commandStr = i18n("Updating to revision %1 ...").tqarg(m_updateToDlg->tagCombo->currentText()); } else { extraOpts = "-D " + m_updateToDlg->dateLineEdit->text(); - commandStr = i18n("Updating to the version from %1 ...").arg(+ m_updateToDlg->dateLineEdit->text()); + commandStr = i18n("Updating to the version from %1 ...").tqarg(+ m_updateToDlg->dateLineEdit->text()); } emit clearMessages(); emit showMessage(commandStr + "\n", false); @@ -430,7 +430,7 @@ void CVSService::slotAddToCVSIgnore() line = str.readLine().stripWhiteSpace(); if (line == fInfo.fileName()) { - emit showMessage(i18n("\"%1\" is already in the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" is already in the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); found = true; break; } @@ -438,7 +438,7 @@ void CVSService::slotAddToCVSIgnore() if (!found) { str << fInfo.fileName() << endl; - emit showMessage(i18n("\"%1\" added to the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" added to the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); } f.close(); } @@ -477,7 +477,7 @@ void CVSService::slotRemoveFromCVSIgnore() } if (!found) { - emit showMessage(i18n("\"%1\" is not in the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" is not in the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); } f.close(); } @@ -486,7 +486,7 @@ void CVSService::slotRemoveFromCVSIgnore() TQTextStream str(&f); str.setEncoding(TQTextStream::UnicodeUTF8); str << content; - emit showMessage(i18n("\"%1\" removed from the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" removed from the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); f.close(); } @@ -501,7 +501,7 @@ void CVSService::slotJobExited(bool normalExit, int exitStatus) { if (!normalExit) { - KMessageBox::sorry(0, i18n("<qt>The CVS command <b>%1</b> has failed. The error code was <i>%2</i>.</qt>").arg(m_cvsCommand).arg(exitStatus), i18n("Command Failed")); + KMessageBox::sorry(0, i18n("<qt>The CVS command <b>%1</b> has failed. The error code was <i>%2</i>.</qt>").tqarg(m_cvsCommand).tqarg(exitStatus), i18n("Command Failed")); } if (exitStatus == 0) { @@ -529,7 +529,7 @@ void CVSService::slotReceivedStderr(TQString output) void CVSService::notInRepository() { emit clearMessages(); - emit showMessage(i18n("Error: \"%1\" is not part of the\n\"%2\" repository.").arg(m_defaultFile).arg(m_repositoryPath) + "\n", false); + emit showMessage(i18n("Error: \"%1\" is not part of the\n\"%2\" repository.").tqarg(m_defaultFile).tqarg(m_repositoryPath) + "\n", false); } void CVSService::startService() diff --git a/quanta/components/cvsservice/cvsservice.h b/quanta/components/cvsservice/cvsservice.h index 9cfc1328..e9f0945c 100644 --- a/quanta/components/cvsservice/cvsservice.h +++ b/quanta/components/cvsservice/cvsservice.h @@ -41,6 +41,7 @@ class CVSUpdateToDlgS; class CVSService : public TQObject, public CVSServiceDCOPIf { Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/cvsservice/cvsupdatetodlgs.ui b/quanta/components/cvsservice/cvsupdatetodlgs.ui index ef646f92..d5e116a4 100644 --- a/quanta/components/cvsservice/cvsupdatetodlgs.ui +++ b/quanta/components/cvsservice/cvsupdatetodlgs.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2005 Andras Mantia <amantia@kde.org></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>CVSUpdateToDlgS</cstring> </property> @@ -28,7 +28,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>dateRadioButton</cstring> </property> @@ -53,7 +53,7 @@ <string>Update to &date ('yyyy-mm-dd'):</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>tagRadioButton</cstring> </property> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -113,9 +113,9 @@ </spacer> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>295</width> <height>20</height> @@ -194,5 +194,5 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> |