From d7633c195a464e4d344ada9eea61afd10110598a Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 4 May 2011 19:54:24 +0000 Subject: Port kdesvn to TQt4 This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdesvn@1230412 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/ksvnwidgets/authdialogimpl.cpp | 22 ++-- src/ksvnwidgets/authdialogimpl.h | 11 +- src/ksvnwidgets/authdlg.ui | 34 +++--- src/ksvnwidgets/depthform.ui | 12 +- src/ksvnwidgets/depthselector.cpp | 28 ++--- src/ksvnwidgets/depthselector.h | 9 +- src/ksvnwidgets/diffbrowser.cpp | 64 +++++----- src/ksvnwidgets/diffbrowser.h | 13 ++- src/ksvnwidgets/diffbrowserdata.h | 6 +- src/ksvnwidgets/diffsyntax.cpp | 34 +++--- src/ksvnwidgets/diffsyntax.h | 18 +-- src/ksvnwidgets/encodingselector.ui | 16 +-- src/ksvnwidgets/encodingselector_impl.cpp | 8 +- src/ksvnwidgets/encodingselector_impl.h | 7 +- src/ksvnwidgets/logmessage.ui | 50 ++++---- src/ksvnwidgets/logmsg_impl.cpp | 186 +++++++++++++++--------------- src/ksvnwidgets/logmsg_impl.h | 49 ++++---- src/ksvnwidgets/pwstorage.cpp | 54 ++++----- src/ksvnwidgets/pwstorage.h | 19 +-- src/ksvnwidgets/revertform.ui | 14 +-- src/ksvnwidgets/revertform_impl.cpp | 16 +-- src/ksvnwidgets/revertform_impl.h | 7 +- src/ksvnwidgets/ssltrustprompt.ui | 8 +- src/ksvnwidgets/ssltrustprompt_impl.cpp | 28 ++--- src/ksvnwidgets/ssltrustprompt_impl.h | 5 +- 25 files changed, 363 insertions(+), 355 deletions(-) (limited to 'src/ksvnwidgets') diff --git a/src/ksvnwidgets/authdialogimpl.cpp b/src/ksvnwidgets/authdialogimpl.cpp index 5cd1fd5..07ed908 100644 --- a/src/ksvnwidgets/authdialogimpl.cpp +++ b/src/ksvnwidgets/authdialogimpl.cpp @@ -23,22 +23,22 @@ #include #include #include -#include -#include +#include +#include -AuthDialogImpl::AuthDialogImpl(const QString & realm,const QString&user,QWidget *parent, const char *name) - :AuthDialogData(parent, name),curPass("") +AuthDialogImpl::AuthDialogImpl(const TQString & realm,const TQString&user,TQWidget *tqparent, const char *name) + :AuthDialogData(tqparent, name),curPass("") { m_UsernameEdit->setText(user); m_PasswordEdit->setText(""); m_StorePasswordButton->setChecked(Kdesvnsettings::store_passwords()); - QString text = m_StorePasswordButton->text(); + TQString text = m_StorePasswordButton->text(); m_StorePasswordButton->setText( - m_StorePasswordButton->text()+QString(" (%1)") - .arg((Kdesvnsettings::passwords_in_wallet()?i18n("into KDE Wallet"):i18n("into subversions simple storage")))); + m_StorePasswordButton->text()+TQString(" (%1)") + .tqarg((Kdesvnsettings::passwords_in_wallet()?i18n("into KDE Wallet"):i18n("into subversions simple storage")))); if (!realm.isEmpty()) { m_RealmLabel->setText(m_RealmLabel->text()+" "+realm); - resize( QSize(334, 158).expandedTo(minimumSizeHint()) ); + resize( TQSize(334, 158).expandedTo(tqminimumSizeHint()) ); } } @@ -46,16 +46,16 @@ void AuthDialogImpl::slotHelp() { } -const QString AuthDialogImpl::Username()const +const TQString AuthDialogImpl::Username()const { return m_UsernameEdit->text(); } -const QString AuthDialogImpl::Password() +const TQString AuthDialogImpl::Password() { #if 0 /* as described in interface description wie must make a copy of string */ - curPass = QString::fromUtf8(m_PasswordEdit->password()); + curPass = TQString::fromUtf8(m_PasswordEdit->password()); return curPass; #endif return m_PasswordEdit->text(); diff --git a/src/ksvnwidgets/authdialogimpl.h b/src/ksvnwidgets/authdialogimpl.h index 2f572b7..7b8d03e 100644 --- a/src/ksvnwidgets/authdialogimpl.h +++ b/src/ksvnwidgets/authdialogimpl.h @@ -21,20 +21,21 @@ #define AUTHDIALOGIMPL_H #include "src/ksvnwidgets/authdlg.h" -#include +#include class AuthDialogImpl: public AuthDialogData { Q_OBJECT + TQ_OBJECT public: - AuthDialogImpl(const QString & realm = "",const QString&user="", QWidget *parent = 0, const char *name = 0); + AuthDialogImpl(const TQString & realm = "",const TQString&user="", TQWidget *tqparent = 0, const char *name = 0); - const QString Username()const; - const QString Password(); + const TQString Username()const; + const TQString Password(); bool maySave()const; protected slots: virtual void slotHelp(); protected: - QString curPass; + TQString curPass; }; #endif diff --git a/src/ksvnwidgets/authdlg.ui b/src/ksvnwidgets/authdlg.ui index 764fd87..10fba25 100644 --- a/src/ksvnwidgets/authdlg.ui +++ b/src/ksvnwidgets/authdlg.ui @@ -1,10 +1,10 @@ AuthDialogData - + AuthDialog - + 0 0 @@ -22,7 +22,7 @@ unnamed - + m_RealmLabel @@ -30,15 +30,15 @@ Enter authentification info for - + - layout4 + tqlayout4 unnamed - + m_PasswordLabel @@ -59,7 +59,7 @@ m_UsernameEdit - + m_UsernameLabel @@ -69,7 +69,7 @@ - + m_StorePasswordButton @@ -80,15 +80,15 @@ true - + - layout3 + tqlayout3 unnamed - + buttonOk @@ -105,7 +105,7 @@ true - + buttonCancel @@ -129,14 +129,14 @@ Expanding - + 90 20 - + buttonHelp @@ -184,10 +184,10 @@ buttonCancel buttonHelp - + slotHelp() - - + + klineedit.h klineedit.h diff --git a/src/ksvnwidgets/depthform.ui b/src/ksvnwidgets/depthform.ui index 3a5d126..ed2a9c1 100644 --- a/src/ksvnwidgets/depthform.ui +++ b/src/ksvnwidgets/depthform.ui @@ -2,11 +2,11 @@ DepthSettings Selector widget for depth enumeration Rajko Albrecht - + DepthForm - + 0 0 @@ -21,7 +21,7 @@ unnamed - + Empty Depth @@ -57,7 +57,7 @@ <i>empty depth</i><br>Just the named directory, no entries. Updates will not pull in any files or subdirectories not already present. </p> <p> -<i>Files depth</i><br>Folder and its file children, but not subdirs. Updates will pull in any files not already present, but not subdirectories. +<i>Files depth</i><br>Folder and its file tqchildren, but not subdirs. Updates will pull in any files not already present, but not subdirectories. </p> <p> <i>Immediate depth</i><br> @@ -80,7 +80,7 @@ Equivalent to the pre-1.5 default update behavior. Expanding - + 40 20 @@ -89,5 +89,5 @@ Equivalent to the pre-1.5 default update behavior. - + diff --git a/src/ksvnwidgets/depthselector.cpp b/src/ksvnwidgets/depthselector.cpp index 842adcf..a732716 100644 --- a/src/ksvnwidgets/depthselector.cpp +++ b/src/ksvnwidgets/depthselector.cpp @@ -22,14 +22,14 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include -DepthSelector::DepthSelector(QWidget *parent, const char *name) - :DepthSettings(parent, name) +DepthSelector::DepthSelector(TQWidget *tqparent, const char *name) + :DepthSettings(tqparent, name) { if (svn::Version::version_major()>1|| svn::Version::version_minor()>4 ) { m_recurse = 0L; @@ -38,29 +38,29 @@ DepthSelector::DepthSelector(QWidget *parent, const char *name) delete m_DepthCombo; m_DepthCombo=0; DepthFormLayout->removeItem(m_leftspacer); - m_recurse = new QCheckBox( this, "m_RecursiveButton" ); + m_recurse = new TQCheckBox( this, "m_RecursiveButton" ); m_recurse->setChecked( TRUE ); m_recurse->setText(i18n( "Recursive" )); DepthFormLayout->addWidget( m_recurse ); - m_recurse->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); + m_recurse->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); DepthFormLayout->addItem(m_leftspacer); } DepthFormLayout->setMargin(0); - setMinimumSize(minimumSizeHint()); + setMinimumSize(tqminimumSizeHint()); adjustSize(); } DepthSelector::~DepthSelector() { } -void DepthSelector::addItemWidget(QWidget*aWidget) +void DepthSelector::addItemWidget(TQWidget*aWidget) { DepthFormLayout->removeItem(m_leftspacer); - aWidget->reparent(this,geometry().topLeft()); + aWidget->reparent(this,tqgeometry().topLeft()); DepthFormLayout->addWidget(aWidget); - aWidget->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); + aWidget->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); DepthFormLayout->addItem(m_leftspacer); - setMinimumSize(minimumSizeHint()); + setMinimumSize(tqminimumSizeHint()); } /*! @@ -90,7 +90,7 @@ svn::Depth DepthSelector::getDepth()const void DepthSelector::hideDepth(bool hide) { - QWidget*w = m_DepthCombo? (QWidget*)m_DepthCombo:(QWidget*)m_recurse; + TQWidget*w = m_DepthCombo? (TQWidget*)m_DepthCombo:(TQWidget*)m_recurse; if (hide) w->hide(); else w->show(); } diff --git a/src/ksvnwidgets/depthselector.h b/src/ksvnwidgets/depthselector.h index 649537b..f6b9e2b 100644 --- a/src/ksvnwidgets/depthselector.h +++ b/src/ksvnwidgets/depthselector.h @@ -24,19 +24,20 @@ #include "src/svnqt/svnqttypes.hpp" -class QCheckBox; +class TQCheckBox; class DepthSelector: public DepthSettings { Q_OBJECT + TQ_OBJECT public: - DepthSelector(QWidget *parent = 0, const char *name = 0); + DepthSelector(TQWidget *tqparent = 0, const char *name = 0); virtual ~DepthSelector(); svn::Depth getDepth()const; - void addItemWidget(QWidget*); + void addItemWidget(TQWidget*); void hideDepth(bool hide); protected: - QCheckBox*m_recurse; + TQCheckBox*m_recurse; }; #endif diff --git a/src/ksvnwidgets/diffbrowser.cpp b/src/ksvnwidgets/diffbrowser.cpp index d1f7b6f..ddc2d5a 100644 --- a/src/ksvnwidgets/diffbrowser.cpp +++ b/src/ksvnwidgets/diffbrowser.cpp @@ -30,25 +30,25 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include /*! - \fn DiffBrowser::DiffBrowser(QWidget*parent=0,const char*name=0) + \fn DiffBrowser::DiffBrowser(TQWidget*tqparent=0,const char*name=0) */ -DiffBrowser::DiffBrowser(QWidget*parent,const char*name) - : KTextBrowser( parent, name) +DiffBrowser::DiffBrowser(TQWidget*tqparent,const char*name) + : KTextBrowser( tqparent, name) { - setTextFormat(Qt::PlainText); + setTextFormat(TQt::PlainText); setFont(KGlobalSettings::fixedFont()); m_Data = new DiffBrowserData; - setWordWrap(QTextEdit::NoWrap); + setWordWrap(TQTextEdit::NoWrap); m_Data->m_Syntax = new DiffSyntax(this); - QToolTip::add(this,i18n("Ctrl-F for search, F3 or Shift-F3 for search again.")); - QWhatsThis::add(this,i18n("Display differences between files

You may search inside text with Ctrl-F.

F3 for search forward again, Shift-F3 for search backward again.

You may save the (original) output with Ctrl-S.

")); + TQToolTip::add(this,i18n("Ctrl-F for search, F3 or Shift-F3 for search again.")); + TQWhatsThis::add(this,i18n("Display differences between files

You may search inside text with Ctrl-F.

F3 for search forward again, Shift-F3 for search backward again.

You may save the (original) output with Ctrl-S.

")); setFocus(); } @@ -60,14 +60,14 @@ DiffBrowser::DiffBrowser(QWidget*parent,const char*name) delete m_Data; } -void DiffBrowser::setText(const QString&aText) +void DiffBrowser::setText(const TQString&aText) { m_Data->m_content.setRawData(aText.local8Bit(),aText.local8Bit().size()); KTextBrowser::setText(aText); setCursorPosition(0,0); } -void DiffBrowser::setText(const QByteArray&aText) +void DiffBrowser::setText(const TQByteArray&aText) { m_Data->m_content=aText; printContent(); @@ -76,9 +76,9 @@ void DiffBrowser::setText(const QByteArray&aText) void DiffBrowser::printContent() { - QTextCodec * cc = QTextCodec::codecForName(Kdesvnsettings::locale_for_diff()); + TQTextCodec * cc = TQTextCodec::codecForName(Kdesvnsettings::locale_for_diff()); if (!cc) { - KTextBrowser::setText(QString::fromLocal8Bit(m_Data->m_content,m_Data->m_content.size())); + KTextBrowser::setText(TQString::fromLocal8Bit(m_Data->m_content,m_Data->m_content.size())); } else { KTextBrowser::setText(cc->toUnicode(m_Data->m_content,m_Data->m_content.size())); } @@ -89,24 +89,24 @@ void DiffBrowser::printContent() */ void DiffBrowser::saveDiff() { - QString saveTo = KFileDialog::getSaveFileName(QString::null,"text/x-diff"); + TQString saveTo = KFileDialog::getSaveFileName(TQString(),"text/x-diff"); if (saveTo.isEmpty()) { return; } - QFile tfile(saveTo); + TQFile tfile(saveTo); if (tfile.exists()) { - if (KMessageBox::warningYesNo(KApplication::activeModalWidget(), - i18n("File %1 exists - overwrite?").arg(saveTo)) + if (KMessageBox::warningYesNo(TQT_TQWIDGET(KApplication::activeModalWidget()), + i18n("File %1 exists - overwrite?").tqarg(saveTo)) !=KMessageBox::Yes) { return; } } tfile.open(IO_Truncate|IO_WriteOnly|IO_Raw); - QDataStream stream( &tfile ); + TQDataStream stream( &tfile ); stream.writeRawBytes(m_Data->m_content.data(),m_Data->m_content.size()); } -void DiffBrowser::keyPressEvent(QKeyEvent*ev) +void DiffBrowser::keyPressEvent(TQKeyEvent*ev) { if ( ev->key() == Key_Return) { ev->ignore(); @@ -131,10 +131,10 @@ void DiffBrowser::startSearch() { if( !m_Data->srchdialog ) { m_Data->srchdialog = new KEdFind( this, "searchdialog", false); - connect(m_Data->srchdialog,SIGNAL(search()),this,SLOT(search_slot())); - connect(m_Data->srchdialog,SIGNAL(done()),this,SLOT(searchdone_slot())); + connect(m_Data->srchdialog,TQT_SIGNAL(search()),this,TQT_SLOT(search_slot())); + connect(m_Data->srchdialog,TQT_SIGNAL(done()),this,TQT_SLOT(searchdone_slot())); } - QString _st = m_Data->srchdialog->getText(); + TQString _st = m_Data->srchdialog->getText(); m_Data->srchdialog->setText(_st.isEmpty() ? m_Data->pattern : _st); m_Data->srchdialog->show(); m_Data->srchdialog->result(); @@ -148,11 +148,11 @@ void DiffBrowser::search_slot() if( !m_Data->srchdialog ) { return; } - QString to_find_string = m_Data->srchdialog->getText(); + TQString to_find_string = m_Data->srchdialog->getText(); doSearch(to_find_string,m_Data->srchdialog->case_sensitive(),m_Data->srchdialog->get_direction()); } -void DiffBrowser::doSearch(const QString&to_find_string,bool case_sensitive,bool back) +void DiffBrowser::doSearch(const TQString&to_find_string,bool case_sensitive,bool back) { if( !m_Data->srchdialog ) { return; @@ -163,7 +163,7 @@ void DiffBrowser::doSearch(const QString&to_find_string,bool case_sensitive,bool col = col+1; } while (1) { - bool result = find(to_find_string,case_sensitive,false, + bool result = tqfind(to_find_string,case_sensitive,false, (!back),&line,&col); if (result) { @@ -171,11 +171,11 @@ void DiffBrowser::doSearch(const QString&to_find_string,bool case_sensitive,bool m_Data->pattern=to_find_string; break; } - QWidget * _parent = m_Data->srchdialog->isVisible()?m_Data->srchdialog:parentWidget(); + TQWidget * _tqparent = m_Data->srchdialog->isVisible()?m_Data->srchdialog:tqparentWidget(); if (!m_Data->srchdialog->get_direction()) { // forward int query = KMessageBox::questionYesNo( - _parent, + _tqparent, i18n("End of document reached.\n"\ "Continue from the beginning?"), i18n("Find"),KStdGuiItem::cont(),i18n("Stop")); @@ -188,13 +188,13 @@ void DiffBrowser::doSearch(const QString&to_find_string,bool case_sensitive,bool } } else { int query = KMessageBox::questionYesNo( - _parent, + _tqparent, i18n("Beginning of document reached.\n"\ "Continue from the end?"), i18n("Find"),KStdGuiItem::cont(),i18n("Stop")); if (query == KMessageBox::Yes){ line = lines()-1; - QString string = text(line); + TQString string = text(line); col = string.length(); if (col>0) { --col; @@ -244,7 +244,7 @@ void DiffBrowser::doSearchAgain(bool back) } } -void DiffBrowser::slotTextCodecChanged(const QString&codec) +void DiffBrowser::slotTextCodecChanged(const TQString&codec) { if (Kdesvnsettings::locale_for_diff()!=codec) { Kdesvnsettings::setLocale_for_diff(codec); diff --git a/src/ksvnwidgets/diffbrowser.h b/src/ksvnwidgets/diffbrowser.h index f7aa946..4793afe 100644 --- a/src/ksvnwidgets/diffbrowser.h +++ b/src/ksvnwidgets/diffbrowser.h @@ -30,22 +30,23 @@ class DiffBrowserData; class DiffBrowser : public KTextBrowser { Q_OBJECT + TQ_OBJECT public: - DiffBrowser(QWidget*parent=0,const char*name=0); + DiffBrowser(TQWidget*tqparent=0,const char*name=0); virtual ~DiffBrowser(); public slots: - virtual void setText(const QString&aText); - virtual void setText(const QByteArray&ex); + virtual void setText(const TQString&aText); + virtual void setText(const TQByteArray&ex); virtual void saveDiff(); - virtual void slotTextCodecChanged(const QString&); + virtual void slotTextCodecChanged(const TQString&); protected: - virtual void keyPressEvent(QKeyEvent*); + virtual void keyPressEvent(TQKeyEvent*); virtual void startSearch(); - virtual void doSearch(const QString&to_find_string,bool case_sensitive,bool back); + virtual void doSearch(const TQString&to_find_string,bool case_sensitive,bool back); virtual void doSearchAgain(bool back); protected: diff --git a/src/ksvnwidgets/diffbrowserdata.h b/src/ksvnwidgets/diffbrowserdata.h index 13ab161..55ee779 100644 --- a/src/ksvnwidgets/diffbrowserdata.h +++ b/src/ksvnwidgets/diffbrowserdata.h @@ -22,7 +22,7 @@ #include -#include +#include class DiffBrowserData { @@ -33,10 +33,10 @@ public: enum {NONE, FORWARD, BACKWARD}; DiffSyntax*m_Syntax; - QByteArray m_content; + TQByteArray m_content; KEdFind *srchdialog; int last_search,last_finished_search; - QString pattern; + TQString pattern; bool cs; }; diff --git a/src/ksvnwidgets/diffsyntax.cpp b/src/ksvnwidgets/diffsyntax.cpp index a38c749..9f5e573 100644 --- a/src/ksvnwidgets/diffsyntax.cpp +++ b/src/ksvnwidgets/diffsyntax.cpp @@ -23,26 +23,26 @@ #include #include -#include +#include /*! - \fn DiffSyntax::DiffSyntax(QTextEdit*) + \fn DiffSyntax::DiffSyntax(TQTextEdit*) */ - DiffSyntax::DiffSyntax(QTextEdit*aTextEdit) - : QSyntaxHighlighter(aTextEdit) + DiffSyntax::DiffSyntax(TQTextEdit*aTextEdit) + : TQSyntaxHighlighter(aTextEdit) { } /*! - \fn DiffSyntax::highlightParagraph ( const QString & text, int endStateOfLastPara ) + \fn DiffSyntax::highlightParagraph ( const TQString & text, int endStateOfLastPara ) */ -int DiffSyntax::highlightParagraph ( const QString & aText, int endStateOfLastPara) +int DiffSyntax::highlightParagraph ( const TQString & aText, int endStateOfLastPara) { - static QRegExp a("^\\w+:\\s.*$"); - static QRegExp b("^\\W+$"); - QColor c(0,0,0); - QFont f(KGlobalSettings::fixedFont()); + static TQRegExp a("^\\w+:\\s.*$"); + static TQRegExp b("^\\W+$"); + TQColor c(0,0,0); + TQFont f(KGlobalSettings::fixedFont()); int ret = 0; if (endStateOfLastPara == 1) { ret = 2; @@ -53,7 +53,7 @@ int DiffSyntax::highlightParagraph ( const QString & aText, int endStateOfLastPa } if (a.match(aText)>-1) { - c = QColor("#660033"); + c = TQColor("#660033"); if (endStateOfLastPara==1||endStateOfLastPara==2) { f.setBold(true); } else { @@ -61,25 +61,25 @@ int DiffSyntax::highlightParagraph ( const QString & aText, int endStateOfLastPa } } else if (aText.startsWith("_____" )) { ret = 1; - c = QColor("#1D1D8F"); + c = TQColor("#1D1D8F"); } else if (aText.startsWith("+")) { - c = QColor("#008B00"); + c = TQColor("#008B00"); if (aText.startsWith("+++")) { f.setBold(true); } } else if (aText.startsWith("-")) { - c = QColor("#CD3333"); + c = TQColor("#CD3333"); if (aText.startsWith("---")) { f.setBold(true); } } else if (aText.startsWith("@@")) { - c = QColor("#1D1D8F"); + c = TQColor("#1D1D8F"); } if (endStateOfLastPara==2 && ret==2) { if (aText.startsWith(" +")) { - c = QColor("#008B00"); + c = TQColor("#008B00"); } else if (aText.startsWith(" -")) { - c = QColor("#CD3333"); + c = TQColor("#CD3333"); } } setFormat(0,(int)aText.length(),f,c); diff --git a/src/ksvnwidgets/diffsyntax.h b/src/ksvnwidgets/diffsyntax.h index 1c1f779..9d14a51 100644 --- a/src/ksvnwidgets/diffsyntax.h +++ b/src/ksvnwidgets/diffsyntax.h @@ -20,19 +20,19 @@ #ifndef _DIFFSYNTAX_H #define _DIFFSYNTAX_H -#include -#include -#include +#include +#include +#include -class QTextEdit; -class QString; -class QColor; +class TQTextEdit; +class TQString; +class TQColor; -class DiffSyntax : public QSyntaxHighlighter +class DiffSyntax : public TQSyntaxHighlighter { public: - DiffSyntax(QTextEdit*); - virtual int highlightParagraph ( const QString & text, int endStateOfLastPara ); + DiffSyntax(TQTextEdit*); + virtual int highlightParagraph ( const TQString & text, int endStateOfLastPara ); virtual ~DiffSyntax(); }; diff --git a/src/ksvnwidgets/encodingselector.ui b/src/ksvnwidgets/encodingselector.ui index 8ea58fb..77b3cde 100644 --- a/src/ksvnwidgets/encodingselector.ui +++ b/src/ksvnwidgets/encodingselector.ui @@ -1,11 +1,11 @@ EncodingSelector Rajko Albrecht - + EncodingSelector - + 0 0 @@ -34,7 +34,7 @@ 0 - + m_Mainlabel @@ -49,11 +49,11 @@ Select encoding: - + AlignVCenter|AlignRight - + Default utf-8 @@ -84,8 +84,8 @@ itemActivated(int) - + itemActivated(int) - - + + diff --git a/src/ksvnwidgets/encodingselector_impl.cpp b/src/ksvnwidgets/encodingselector_impl.cpp index d062970..77142f2 100644 --- a/src/ksvnwidgets/encodingselector_impl.cpp +++ b/src/ksvnwidgets/encodingselector_impl.cpp @@ -22,10 +22,10 @@ #include #include -#include +#include -EncodingSelector_impl::EncodingSelector_impl(const QString&cur,QWidget *parent, const char *name) - :EncodingSelector(parent, name) +EncodingSelector_impl::EncodingSelector_impl(const TQString&cur,TQWidget *tqparent, const char *name) + :EncodingSelector(tqparent, name) { m_encodingList->insertStringList( KGlobal::charsets()->availableEncodingNames()); @@ -40,7 +40,7 @@ EncodingSelector_impl::EncodingSelector_impl(const QString&cur,QWidget *parent, void EncodingSelector_impl::itemActivated(int which) { if (which == 0) { - emit TextCodecChanged(QString("")); + emit TextCodecChanged(TQString("")); } else { emit TextCodecChanged(m_encodingList->currentText()); } diff --git a/src/ksvnwidgets/encodingselector_impl.h b/src/ksvnwidgets/encodingselector_impl.h index ff8f8e6..7a6bf3e 100644 --- a/src/ksvnwidgets/encodingselector_impl.h +++ b/src/ksvnwidgets/encodingselector_impl.h @@ -22,19 +22,20 @@ #include "src/ksvnwidgets/encodingselector.h" -class QTextCodec; +class TQTextCodec; class EncodingSelector_impl: public EncodingSelector { Q_OBJECT + TQ_OBJECT public: - EncodingSelector_impl(const QString&cur, QWidget *parent = 0, const char *name = 0); + EncodingSelector_impl(const TQString&cur, TQWidget *tqparent = 0, const char *name = 0); virtual ~EncodingSelector_impl(){} protected slots: virtual void itemActivated(int); signals: - void TextCodecChanged(const QString&); + void TextCodecChanged(const TQString&); }; #endif diff --git a/src/ksvnwidgets/logmessage.ui b/src/ksvnwidgets/logmessage.ui index faa8bd9..5700cea 100644 --- a/src/ksvnwidgets/logmessage.ui +++ b/src/ksvnwidgets/logmessage.ui @@ -1,10 +1,10 @@ LogmessageData - + LogmessageData - + 0 0 @@ -19,14 +19,14 @@ unnamed - + m_MainSplitter Vertical - + m_ReviewFrame @@ -40,18 +40,18 @@ unnamed - + m_Reviewlabel Review affected items - + AlignCenter - + Entry @@ -90,15 +90,15 @@ LastColumn - + - layout5 + tqlayout5 unnamed - + m_HideNewItems @@ -109,7 +109,7 @@ true - + m_MarkUnversioned @@ -120,7 +120,7 @@ Mark all new e.g. not versioned items for add and commit. - + m_UnmarkUnversioned @@ -131,7 +131,7 @@ Unmark all unversioned items so they will be ignored. - + m_DiffItem @@ -146,7 +146,7 @@ - + m_EditFrame @@ -160,14 +160,14 @@ unnamed - + m_HeadLabel Enter a log message - + AlignCenter @@ -179,9 +179,9 @@ - + - layout6 + tqlayout6 @@ -211,7 +211,7 @@ Last used log messages - + m_LogLabel @@ -219,7 +219,7 @@ Or insert one of the last: - + m_insert_file_button @@ -237,7 +237,7 @@ - + m_ItemsLayout @@ -250,7 +250,7 @@ m_DepthSelector - + m_keepLocksButton @@ -326,7 +326,7 @@ insertFile() - + slotHistoryActivated(const QString&) slotHistoryActivated(int) slotMarkUnversioned() @@ -334,8 +334,8 @@ slotUnmarkUnversioned() hideNewItems(bool) insertFile() - - + + ktextedit.h kcombobox.h diff --git a/src/ksvnwidgets/logmsg_impl.cpp b/src/ksvnwidgets/logmsg_impl.cpp index f083d4c..0a10467 100644 --- a/src/ksvnwidgets/logmsg_impl.cpp +++ b/src/ksvnwidgets/logmsg_impl.cpp @@ -36,36 +36,36 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #define MAX_MESSAGE_HISTORY 10 -QValueList Logmsg_impl::sLogHistory = QValueList(); -QString Logmsg_impl::sLastMessage=QString(); -const QString Logmsg_impl::groupName("logmsg_dlg_size"); +TQValueList Logmsg_impl::sLogHistory = TQValueList(); +TQString Logmsg_impl::sLastMessage=TQString(); +const TQString Logmsg_impl::groupName("logmsg_dlg_size"); unsigned int Logmsg_impl::smax_message_history = 0xFFFF; -class SvnCheckListItem:public QCheckListItem +class SvnCheckListItem:public TQCheckListItem { protected: Logmsg_impl::logActionEntry m_Content; public: - SvnCheckListItem(QListView*,const Logmsg_impl::logActionEntry&); + SvnCheckListItem(TQListView*,const Logmsg_impl::logActionEntry&); const Logmsg_impl::logActionEntry&data(){return m_Content;} virtual int rtti()const{return 1000;} - virtual int compare( QListViewItem* item, int col, bool ascending ) const; + virtual int compare( TQListViewItem* item, int col, bool ascending ) const; }; -Logmsg_impl::Logmsg_impl(QWidget *parent, const char *name) - :LogmessageData(parent, name) +Logmsg_impl::Logmsg_impl(TQWidget *tqparent, const char *name) + :LogmessageData(tqparent, name) { m_LogEdit->setFocus(); m_Reviewlabel->hide(); @@ -81,8 +81,8 @@ Logmsg_impl::Logmsg_impl(QWidget *parent, const char *name) m_DiffItem=0; } -Logmsg_impl::Logmsg_impl(const svn::CommitItemList&_items,QWidget *parent, const char *name) - :LogmessageData(parent, name) +Logmsg_impl::Logmsg_impl(const svn::CommitItemList&_items,TQWidget *tqparent, const char *name) + :LogmessageData(tqparent, name) { m_LogEdit->setFocus(); m_ReviewList->setColumnText(1,i18n("Items to commit")); @@ -91,13 +91,13 @@ Logmsg_impl::Logmsg_impl(const svn::CommitItemList&_items,QWidget *parent, const hideButtons(true); if (_items.count()>0) { for (unsigned i = 0;i<_items.count();++i) { - QListViewItem*item = new QListViewItem(m_ReviewList); + TQListViewItem*item = new TQListViewItem(m_ReviewList); if (_items[i].path().isEmpty()) { item->setText(1,_items[i].url()); } else { item->setText(1,_items[i].path()); } - item->setText(0,QChar(_items[i].actionType())); + item->setText(0,TQChar(_items[i].actionType())); } m_hidden=false; } else { @@ -108,8 +108,8 @@ Logmsg_impl::Logmsg_impl(const svn::CommitItemList&_items,QWidget *parent, const checkSplitterSize(); } -Logmsg_impl::Logmsg_impl(const QMap&_items,QWidget *parent, const char *name) - :LogmessageData(parent, name) +Logmsg_impl::Logmsg_impl(const TQMap&_items,TQWidget *tqparent, const char *name) + :LogmessageData(tqparent, name) { m_LogEdit->setFocus(); m_ReviewList->setColumnText(1,i18n("Items to commit")); @@ -117,9 +117,9 @@ Logmsg_impl::Logmsg_impl(const QMap&_items,QWidget *parent, con m_ReviewList->setSortColumn(1); hideButtons(true); if (_items.count()>0) { - QMap::ConstIterator it = _items.begin(); + TQMap::ConstIterator it = _items.begin(); for (;it!=_items.end();++it) { - QListViewItem*item = new QListViewItem(m_ReviewList); + TQListViewItem*item = new TQListViewItem(m_ReviewList); item->setText(1,it.key()); item->setText(0,it.data()); } @@ -134,18 +134,18 @@ Logmsg_impl::Logmsg_impl(const QMap&_items,QWidget *parent, con Logmsg_impl::Logmsg_impl(const logActionEntries&_activatedList, const logActionEntries&_notActivatedList, - QWidget *parent, const char *name) - :LogmessageData(parent, name) + TQWidget *tqparent, const char *name) + :LogmessageData(tqparent, name) { m_LogEdit->setFocus(); m_hidden=false; for (unsigned j = 0; j<_activatedList.count();++j) { SvnCheckListItem * item = new SvnCheckListItem(m_ReviewList,_activatedList[j]); - item->setState(QCheckListItem::On); + item->setState(TQCheckListItem::On); } for (unsigned j = 0; j<_notActivatedList.count();++j) { SvnCheckListItem * item = new SvnCheckListItem(m_ReviewList,_notActivatedList[j]); - item->setState(QCheckListItem::Off); + item->setState(TQCheckListItem::Off); } m_HideNewItems->setOn(Kdesvnsettings::commit_hide_new()); checkSplitterSize(); @@ -153,7 +153,7 @@ Logmsg_impl::Logmsg_impl(const logActionEntries&_activatedList, Logmsg_impl::~Logmsg_impl() { - QValueList list = m_MainSplitter->sizes(); + TQValueList list = m_MainSplitter->sizes(); if (!m_hidden && list.count()==2) { Kdesvnsettings::setCommit_splitter_height(list); Kdesvnsettings::writeConfig(); @@ -161,12 +161,12 @@ Logmsg_impl::~Logmsg_impl() for (unsigned int j=0; jstate()==QButton::On); + Kdesvnsettings::setCommit_hide_new(m_HideNewItems->state()==TQButton::On); } void Logmsg_impl::checkSplitterSize() { - QValueList list = Kdesvnsettings::commit_splitter_height(); + TQValueList list = Kdesvnsettings::commit_splitter_height(); if (list.count()!=2) { return; } @@ -191,7 +191,7 @@ void Logmsg_impl::slotHistoryActivated(int number) /*! \fn Logmsg_impl::getMessage()const */ -QString Logmsg_impl::getMessage()const +TQString Logmsg_impl::getMessage()const { return m_LogEdit->text(); } @@ -222,22 +222,22 @@ void Logmsg_impl::initHistory() if (smax_message_history==0xFFFF) { smax_message_history = Kdesvnsettings::max_log_messages(); KConfigGroup cs(Kdesvnsettings::self()->config(),"log_messages"); - QString s = QString::null; + TQString s = TQString(); unsigned int current = 0; - QString key = QString("log_%0").arg(current); - s = cs.readEntry(key,QString::null); - while (s!=QString::null) { + TQString key = TQString("log_%0").tqarg(current); + s = cs.readEntry(key,TQString()); + while (s!=TQString()) { if (current::const_iterator it; + TQValueList::const_iterator it; for (it=sLogHistory.begin();it!=sLogHistory.end();++it) { if ((*it).length()<=40) { m_LogHistory->insertItem((*it)); @@ -247,7 +247,7 @@ void Logmsg_impl::initHistory() } if (sLastMessage.length()>0) { m_LogEdit->setText(sLastMessage); - sLastMessage=QString(); + sLastMessage=TQString(); } } @@ -260,8 +260,8 @@ void Logmsg_impl::saveHistory(bool canceld) if (m_LogEdit->text().length()==0||m_LogEdit->text().length()>512) return; /// @todo make static threadsafe if (!canceld) { - QValueList::iterator it; - if ( (it=sLogHistory.find(m_LogEdit->text()))!=sLogHistory.end()) { + TQValueList::iterator it; + if ( (it=sLogHistory.tqfind(m_LogEdit->text()))!=sLogHistory.end()) { sLogHistory.erase(it); } sLogHistory.push_front(m_LogEdit->text()); @@ -270,7 +270,7 @@ void Logmsg_impl::saveHistory(bool canceld) } KConfigGroup cs(Kdesvnsettings::self()->config(),"log_messages"); for (unsigned int i = 0; i < sLogHistory.size();++i) { - cs.writeEntry(QString("log_%0").arg(i),sLogHistory[i]); + cs.writeEntry(TQString("log_%0").tqarg(i),sLogHistory[i]); } cs.sync(); } else { @@ -278,17 +278,17 @@ void Logmsg_impl::saveHistory(bool canceld) } } -QString Logmsg_impl::getLogmessage(bool*ok,svn::Depth*rec,bool*keep_locks,QWidget*parent,const char*name) +TQString Logmsg_impl::getLogmessage(bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*tqparent,const char*name) { bool _ok,_keep_locks; svn::Depth _depth = svn::DepthUnknown; - QString msg(""); + TQString msg(""); Logmsg_impl*ptr=0; - KDialogBase dlg(parent,name,true,i18n("Commit log"), + KDialogBase dlg(tqparent,name,true,i18n("Commit log"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,true); - QWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); ptr = new Logmsg_impl(Dialog1Layout); if (!rec) { @@ -299,7 +299,7 @@ QString Logmsg_impl::getLogmessage(bool*ok,svn::Depth*rec,bool*keep_locks,QWidge } ptr->initHistory(); dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()),groupName)); - if (dlg.exec()!=QDialog::Accepted) { + if (dlg.exec()!=TQDialog::Accepted) { _ok = false; /* avoid compiler warnings */ _keep_locks = false; @@ -317,17 +317,17 @@ QString Logmsg_impl::getLogmessage(bool*ok,svn::Depth*rec,bool*keep_locks,QWidge return msg; } -QString Logmsg_impl::getLogmessage(const svn::CommitItemList&items,bool*ok,svn::Depth*rec,bool*keep_locks,QWidget*parent,const char*name) +TQString Logmsg_impl::getLogmessage(const svn::CommitItemList&items,bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*tqparent,const char*name) { bool _ok,_keep_locks; svn::Depth _depth = svn::DepthUnknown; - QString msg(""); + TQString msg(""); Logmsg_impl*ptr=0; - KDialogBase dlg(parent,name,true,i18n("Commit log"), + KDialogBase dlg(tqparent,name,true,i18n("Commit log"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,true); - QWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); ptr = new Logmsg_impl(items,Dialog1Layout); if (!rec) { @@ -339,7 +339,7 @@ QString Logmsg_impl::getLogmessage(const svn::CommitItemList&items,bool*ok,svn:: ptr->initHistory(); dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()),groupName)); - if (dlg.exec()!=QDialog::Accepted) { + if (dlg.exec()!=TQDialog::Accepted) { _ok = false; /* avoid compiler warnings */ _keep_locks = false; @@ -358,18 +358,18 @@ QString Logmsg_impl::getLogmessage(const svn::CommitItemList&items,bool*ok,svn:: return msg; } -QString Logmsg_impl::getLogmessage(const QMap&items, - bool*ok,svn::Depth*rec,bool*keep_locks,QWidget*parent,const char*name) +TQString Logmsg_impl::getLogmessage(const TQMap&items, + bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*tqparent,const char*name) { bool _ok,_rec,_keep_locks; svn::Depth _depth = svn::DepthUnknown; - QString msg(""); + TQString msg(""); Logmsg_impl*ptr=0; - KDialogBase dlg(parent,name,true,i18n("Commit log"), + KDialogBase dlg(tqparent,name,true,i18n("Commit log"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,true); - QWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); ptr = new Logmsg_impl(items,Dialog1Layout); if (!rec) { @@ -380,7 +380,7 @@ QString Logmsg_impl::getLogmessage(const QMap&items, } ptr->initHistory(); dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()),groupName)); - if (dlg.exec()!=QDialog::Accepted) { + if (dlg.exec()!=TQDialog::Accepted) { _ok = false; /* avoid compiler warnings */ _rec = false; @@ -400,20 +400,20 @@ QString Logmsg_impl::getLogmessage(const QMap&items, return msg; } -QString Logmsg_impl::getLogmessage(const logActionEntries&_on, +TQString Logmsg_impl::getLogmessage(const logActionEntries&_on, const logActionEntries&_off, - QObject*callback, + TQObject*callback, logActionEntries&_result, - bool*ok,bool*keep_locks,QWidget*parent,const char*name) + bool*ok,bool*keep_locks,TQWidget*tqparent,const char*name) { bool _ok,_keep_locks; - QString msg(""); + TQString msg(""); Logmsg_impl*ptr=0; - KDialogBase dlg(parent,name,true,i18n("Commit log"), + KDialogBase dlg(tqparent,name,true,i18n("Commit log"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,true); - QWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); ptr = new Logmsg_impl(_on,_off,Dialog1Layout); ptr->m_DepthSelector->hide(); if (!keep_locks) { @@ -422,11 +422,11 @@ QString Logmsg_impl::getLogmessage(const logActionEntries&_on, ptr->initHistory(); if (callback) { - connect(ptr,SIGNAL(makeDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*)), - callback,SLOT(makeDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*))); + connect(ptr,TQT_SIGNAL(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), + callback,TQT_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))); } dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()),groupName)); - if (dlg.exec()!=QDialog::Accepted) { + if (dlg.exec()!=TQDialog::Accepted) { _ok = false; /* avoid compiler warnings */ _keep_locks=false; @@ -444,23 +444,23 @@ QString Logmsg_impl::getLogmessage(const logActionEntries&_on, } /*! - \fn Logmsg_impl::setRecCheckboxtext(const QString&what) + \fn Logmsg_impl::setRecCheckboxtext(const TQString&what) */ -void Logmsg_impl::addItemWidget(QWidget*aWidget) +void Logmsg_impl::addItemWidget(TQWidget*aWidget) { m_DepthSelector->addItemWidget(aWidget); -/* aWidget->reparent(this,geometry().topLeft()); +/* aWidget->reparent(this,tqgeometry().topLeft()); m_ItemsLayout->addWidget(aWidget); - kdDebug()<<"SizeHint: "<minimumSizeHint()<< endl; - aWidget->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); - setMinimumHeight(minimumSizeHint().height());*/ + kdDebug()<<"SizeHint: "<tqminimumSizeHint()<< endl; + aWidget->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + setMinimumHeight(tqminimumSizeHint().height());*/ } Logmsg_impl::logActionEntries Logmsg_impl::selectedEntries() { logActionEntries _result; if (m_ReviewList) { - QListViewItemIterator it( m_ReviewList ); + TQListViewItemIterator it( m_ReviewList ); while ( it.current() ) { if (it.current()->rtti()==1000) { SvnCheckListItem *item = static_cast(it.current()); @@ -474,7 +474,7 @@ Logmsg_impl::logActionEntries Logmsg_impl::selectedEntries() return _result; } -Logmsg_impl::logActionEntry::logActionEntry(const QString&name,const QString&action,ACTION_TYPE kind) +Logmsg_impl::logActionEntry::logActionEntry(const TQString&name,const TQString&action,ACTION_TYPE kind) : _name(name),_actionDesc(action),_kind(kind) { } @@ -484,8 +484,8 @@ Logmsg_impl::logActionEntry::logActionEntry() { } -SvnCheckListItem::SvnCheckListItem(QListView*parent,const Logmsg_impl::logActionEntry&content) - :QCheckListItem(parent,content._name,QCheckListItem::CheckBox),m_Content(content) +SvnCheckListItem::SvnCheckListItem(TQListView*tqparent,const Logmsg_impl::logActionEntry&content) + :TQCheckListItem(tqparent,content._name,TQCheckListItem::CheckBox),m_Content(content) { setTristate(FALSE); setText(1,m_Content._actionDesc); @@ -494,10 +494,10 @@ SvnCheckListItem::SvnCheckListItem(QListView*parent,const Logmsg_impl::logAction } } -int SvnCheckListItem::compare( QListViewItem* item, int col, bool ascending ) const +int SvnCheckListItem::compare( TQListViewItem* item, int col, bool ascending ) const { if (item->rtti()!=1000 || col>0) { - return QCheckListItem::compare(item,col,ascending); + return TQCheckListItem::compare(item,col,ascending); } SvnCheckListItem* k = static_cast( item ); if (Kdesvnsettings::case_sensitive_sort()) { @@ -522,7 +522,7 @@ void Logmsg_impl::slotMarkUnversioned() void Logmsg_impl::slotDiffSelected() { - QListViewItem * it=0; + TQListViewItem * it=0; if (!m_ReviewList || !(it=m_ReviewList->selectedItem())) { return; @@ -530,8 +530,8 @@ void Logmsg_impl::slotDiffSelected() if (it->rtti()==1000) { SvnCheckListItem *item = static_cast(it); - QString what = item->data()._name; - emit makeDiff(what,svn::Revision::BASE,what,svn::Revision::WORKING,parentWidget()); + TQString what = item->data()._name; + emit makeDiff(what,svn::Revision::BASE,what,svn::Revision::WORKING,tqparentWidget()); } } @@ -560,7 +560,7 @@ void Logmsg_impl::hideButtons(bool how) void Logmsg_impl::markUnversioned(bool mark) { if (!m_ReviewList)return; - QListViewItemIterator it( m_ReviewList ); + TQListViewItemIterator it( m_ReviewList ); while ( it.current() ) { if (it.current()->rtti()==1000) { SvnCheckListItem *item = static_cast(it.current()); @@ -577,7 +577,7 @@ void Logmsg_impl::hideNewItems(bool how) if (!m_ReviewList)return; if (how) { - QListViewItemIterator it( m_ReviewList ); + TQListViewItemIterator it( m_ReviewList ); while ( it.current() ) { if (it.current()->rtti()==1000) { SvnCheckListItem *item = static_cast(it.current()); @@ -609,12 +609,12 @@ void Logmsg_impl::hideDepth(bool ahide) // else m_DepthSelector->show(); } -void Logmsg_impl::insertFile(const QString&fname) +void Logmsg_impl::insertFile(const TQString&fname) { - QFile ifs(fname); + TQFile ifs(fname); if (ifs.open(IO_ReadOnly)) { - QTextStream ts(&ifs); - QString _content = ts.read(); + TQTextStream ts(&ifs); + TQString _content = ts.read(); int para,index; m_LogEdit->getCursorPosition(¶,&index); m_LogEdit->insertAt(_content,para,index); @@ -623,14 +623,14 @@ void Logmsg_impl::insertFile(const QString&fname) void Logmsg_impl::insertFile() { - QString head = i18n("Select textfile for insert"); - KURLRequesterDlg dlg(QString::null,this,head); + TQString head = i18n("Select textfile for insert"); + KURLRequesterDlg dlg(TQString(),this,head); dlg.setCaption(head); KFile::Mode mode = static_cast(KFile::File); dlg.urlRequester()->setMode(mode); dlg.urlRequester()->setCaption(head); - if (dlg.exec()!=QDialog::Accepted) { + if (dlg.exec()!=TQDialog::Accepted) { return; } KURL _url = dlg.selectedURL(); @@ -640,7 +640,7 @@ void Logmsg_impl::insertFile() if (_url.isLocalFile()) { insertFile(_url.path()); } else { - QString tmpFile; + TQString tmpFile; if( KIO::NetAccess::download(_url, tmpFile, this) ) { insertFile( tmpFile ); KIO::NetAccess::removeTempFile( tmpFile ); diff --git a/src/ksvnwidgets/logmsg_impl.h b/src/ksvnwidgets/logmsg_impl.h index 5d41ccf..30d11cd 100644 --- a/src/ksvnwidgets/logmsg_impl.h +++ b/src/ksvnwidgets/logmsg_impl.h @@ -22,15 +22,16 @@ #include "src/ksvnwidgets/logmessage.h" #include "src/svnqt/commititem.hpp" -#include -#include +#include +#include class Logmsg_impl: public LogmessageData { Q_OBJECT + TQ_OBJECT public: struct logActionEntry { - QString _name; - QString _actionDesc; + TQString _name; + TQString _actionDesc; enum ACTION_TYPE{ COMMIT=0, @@ -39,36 +40,36 @@ public: MISSING_DELETE=3 }; ACTION_TYPE _kind; - logActionEntry(const QString&,const QString&,ACTION_TYPE kind = COMMIT); + logActionEntry(const TQString&,const TQString&,ACTION_TYPE kind = COMMIT); logActionEntry(); }; - typedef QValueList logActionEntries; + typedef TQValueList logActionEntries; - Logmsg_impl(QWidget *parent = 0, const char *name = 0); - Logmsg_impl(const svn::CommitItemList&_items,QWidget *parent=0, const char *name=0); - Logmsg_impl(const QMap&_items,QWidget *parent=0, const char *name=0); + Logmsg_impl(TQWidget *tqparent = 0, const char *name = 0); + Logmsg_impl(const svn::CommitItemList&_items,TQWidget *tqparent=0, const char *name=0); + Logmsg_impl(const TQMap&_items,TQWidget *tqparent=0, const char *name=0); Logmsg_impl(const logActionEntries&, const logActionEntries&, - QWidget *parent = 0, const char *name = 0); + TQWidget *tqparent = 0, const char *name = 0); virtual ~Logmsg_impl(); - QString getMessage()const; + TQString getMessage()const; bool isKeeplocks()const; void initHistory(); void saveHistory(bool canceld); - static QString getLogmessage(bool*ok,svn::Depth*rec,bool*keeps_locks,QWidget*parent=0,const char*name=0); - static QString getLogmessage(const svn::CommitItemList&,bool*ok,svn::Depth*rec,bool*keep_locks,QWidget*parent=0,const char*name=0); - static QString getLogmessage(const QMap&,bool*ok,svn::Depth*rec,bool*keep_locks,QWidget*parent=0,const char*name=0); + static TQString getLogmessage(bool*ok,svn::Depth*rec,bool*keeps_locks,TQWidget*tqparent=0,const char*name=0); + static TQString getLogmessage(const svn::CommitItemList&,bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*tqparent=0,const char*name=0); + static TQString getLogmessage(const TQMap&,bool*ok,svn::Depth*rec,bool*keep_locks,TQWidget*tqparent=0,const char*name=0); - static QString getLogmessage(const logActionEntries&, + static TQString getLogmessage(const logActionEntries&, const logActionEntries&, - QObject*callback, + TQObject*callback, logActionEntries&, - bool*ok,bool*keep_locks,QWidget*parent=0,const char*name=0); + bool*ok,bool*keep_locks,TQWidget*tqparent=0,const char*name=0); - void addItemWidget(QWidget*); + void addItemWidget(TQWidget*); svn::Depth getDepth()const; @@ -84,19 +85,19 @@ protected slots: virtual void insertFile(); protected: - static QValueList sLogHistory; - QValueList m_Hidden; - static const QString groupName; - static QString sLastMessage; + static TQValueList sLogHistory; + TQValueList m_Hidden; + static const TQString groupName; + static TQString sLastMessage; static unsigned int smax_message_history; bool m_hidden; void hideButtons(bool); void markUnversioned(bool mark); void checkSplitterSize(); - virtual void insertFile(const QString&); + virtual void insertFile(const TQString&); signals: - void makeDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*); + void makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*); }; #endif diff --git a/src/ksvnwidgets/pwstorage.cpp b/src/ksvnwidgets/pwstorage.cpp index c239b5a..492e6f6 100644 --- a/src/ksvnwidgets/pwstorage.cpp +++ b/src/ksvnwidgets/pwstorage.cpp @@ -25,9 +25,9 @@ #include #include -#include -#include -#include +#include +#include +#include class PwStorageData { @@ -45,21 +45,21 @@ public: KWallet::Wallet*getWallet(); - typedef QPair userpw_type; - typedef QMap cache_type; + typedef TQPair userpw_type; + typedef TQMap cache_type; cache_type*getLoginCache(); - QMutex*getCacheMutex(); + TQMutex*getCacheMutex(); protected: KWallet::Wallet* m_Wallet; }; -QMutex*PwStorageData::getCacheMutex() +TQMutex*PwStorageData::getCacheMutex() { - static QMutex _mutex; + static TQMutex _mutex; return &_mutex; } @@ -78,8 +78,8 @@ KWallet::Wallet*PwStorageData::getWallet() if (KWallet::Wallet::isEnabled()) { WId window = 0; - if ( qApp->activeWindow() ) { - window = qApp->activeWindow()->winId(); + if ( tqApp->activeWindow() ) { + window = tqApp->activeWindow()->winId(); } delete m_Wallet; m_Wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(),window); @@ -108,7 +108,7 @@ PwStorage*PwStorage::self() \fn PwStorage::PwStorageData() */ PwStorage::PwStorage() - :QObject() + :TQObject() { mData = new PwStorageData; } @@ -131,9 +131,9 @@ bool PwStorage::connectWallet() } /*! - \fn PwStorage::getCertPw(const QString&realm,QString&pw) + \fn PwStorage::getCertPw(const TQString&realm,TQString&pw) */ -bool PwStorage::getCertPw(const QString&realm,QString&pw) +bool PwStorage::getCertPw(const TQString&realm,TQString&pw) { if (!mData->getWallet()) { return false; @@ -143,16 +143,16 @@ bool PwStorage::getCertPw(const QString&realm,QString&pw) /*! - \fn PwStorage::getLogin(const QString&realm,QString&user,QString&pw) + \fn PwStorage::getLogin(const TQString&realm,TQString&user,TQString&pw) */ -bool PwStorage::getLogin(const QString&realm,QString&user,QString&pw) +bool PwStorage::getLogin(const TQString&realm,TQString&user,TQString&pw) { if (!mData->getWallet()) { return false; } - QMap content; + TQMap content; int j = mData->getWallet()->readMap(realm,content); - if (j!=0||content.find("user")==content.end()) { + if (j!=0||content.tqfind("user")==content.end()) { return true; } user = content["user"]; @@ -160,10 +160,10 @@ bool PwStorage::getLogin(const QString&realm,QString&user,QString&pw) return true; } -bool PwStorage::getCachedLogin(const QString&realm,QString&user,QString&pw) +bool PwStorage::getCachedLogin(const TQString&realm,TQString&user,TQString&pw) { - QMutexLocker lc(mData->getCacheMutex()); - PwStorageData::cache_type::ConstIterator it = mData->getLoginCache()->find(realm); + TQMutexLocker lc(mData->getCacheMutex()); + PwStorageData::cache_type::ConstIterator it = mData->getLoginCache()->tqfind(realm); if (it!=mData->getLoginCache()->end()) { user=(*it).first; pw = (*it).second; @@ -172,9 +172,9 @@ bool PwStorage::getCachedLogin(const QString&realm,QString&user,QString&pw) } /*! - \fn PwStorage::setCertPw(const QString&realm, const QString&pw) + \fn PwStorage::setCertPw(const TQString&realm, const TQString&pw) */ -bool PwStorage::setCertPw(const QString&realm, const QString&pw) +bool PwStorage::setCertPw(const TQString&realm, const TQString&pw) { if (!mData->getWallet()) { return false; @@ -184,22 +184,22 @@ bool PwStorage::setCertPw(const QString&realm, const QString&pw) /*! - \fn PwStorage::setLogin(const QString&realm,const QString&user,const QString&pw) + \fn PwStorage::setLogin(const TQString&realm,const TQString&user,const TQString&pw) */ -bool PwStorage::setLogin(const QString&realm,const QString&user,const QString&pw) +bool PwStorage::setLogin(const TQString&realm,const TQString&user,const TQString&pw) { if (!mData->getWallet()) { return false; } - QMap content; + TQMap content; content["user"]=user; content["password"]=pw; return (mData->getWallet()->writeMap(realm,content)==0); } -bool PwStorage::setCachedLogin(const QString&realm,const QString&user,const QString&pw) +bool PwStorage::setCachedLogin(const TQString&realm,const TQString&user,const TQString&pw) { - QMutexLocker lc(mData->getCacheMutex()); + TQMutexLocker lc(mData->getCacheMutex()); PwStorageData::cache_type*_Cache = mData->getLoginCache(); (*_Cache)[realm]=PwStorageData::userpw_type(user,pw); return true; diff --git a/src/ksvnwidgets/pwstorage.h b/src/ksvnwidgets/pwstorage.h index 93e9680..821005e 100644 --- a/src/ksvnwidgets/pwstorage.h +++ b/src/ksvnwidgets/pwstorage.h @@ -20,26 +20,27 @@ #ifndef _PWSTORAGE_H #define _PWSTORAGE_H -#include -#include +#include +#include class PwStorageData; /** Access to wallet isn't threadsafe 'cause wallet has not to be called from within threads! */ -class PwStorage:public QObject +class PwStorage:public TQObject { Q_OBJECT + TQ_OBJECT protected: PwStorageData* mData; public: - bool getCertPw(const QString&realm,QString&pw); - bool getLogin(const QString&realm,QString&user,QString&pw); - bool getCachedLogin(const QString&realm,QString&user,QString&pw); - bool setCertPw(const QString&realm, const QString&pw); - bool setLogin(const QString&realm,const QString&user,const QString&pw); - bool setCachedLogin(const QString&realm,const QString&user,const QString&pw); + bool getCertPw(const TQString&realm,TQString&pw); + bool getLogin(const TQString&realm,TQString&user,TQString&pw); + bool getCachedLogin(const TQString&realm,TQString&user,TQString&pw); + bool setCertPw(const TQString&realm, const TQString&pw); + bool setLogin(const TQString&realm,const TQString&user,const TQString&pw); + bool setCachedLogin(const TQString&realm,const TQString&user,const TQString&pw); bool connectWallet(); static PwStorage*self(); diff --git a/src/ksvnwidgets/revertform.ui b/src/ksvnwidgets/revertform.ui index 37ee867..e28dcb4 100644 --- a/src/ksvnwidgets/revertform.ui +++ b/src/ksvnwidgets/revertform.ui @@ -1,10 +1,10 @@ RevertForm - + RevertForm - + 0 0 @@ -20,7 +20,7 @@ 0 - + 0 20 @@ -33,7 +33,7 @@ unnamed - + m_headLine @@ -41,7 +41,7 @@ Really revert these entries to pristine state? - + m_ItemsList @@ -50,7 +50,7 @@ m_DepthSelect - + 0 20 @@ -82,7 +82,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082 - + src/ksvnwidgets/depthselector.h diff --git a/src/ksvnwidgets/revertform_impl.cpp b/src/ksvnwidgets/revertform_impl.cpp index 8dada74..19a8a18 100644 --- a/src/ksvnwidgets/revertform_impl.cpp +++ b/src/ksvnwidgets/revertform_impl.cpp @@ -20,16 +20,16 @@ #include "revertform_impl.h" #include "depthselector.h" -#include -#include +#include +#include /*! - \fn RevertFormImpl::RevertFormImpl(QWidget*parent,const char*name) + \fn RevertFormImpl::RevertFormImpl(TQWidget*tqparent,const char*name) */ - RevertFormImpl::RevertFormImpl(QWidget*parent,const char*name) - :RevertForm(parent,name) + RevertFormImpl::RevertFormImpl(TQWidget*tqparent,const char*name) + :RevertForm(tqparent,name) { - setMinimumSize(minimumSizeHint()); + setMinimumSize(tqminimumSizeHint()); } /*! @@ -47,9 +47,9 @@ svn::Depth RevertFormImpl::getDepth()const /*! - \fn RevertFormImpl::setDispList(const QStringList&_list) + \fn RevertFormImpl::setDispList(const TQStringList&_list) */ -void RevertFormImpl::setDispList(const QStringList&_list) +void RevertFormImpl::setDispList(const TQStringList&_list) { m_ItemsList->insertStringList(_list); } diff --git a/src/ksvnwidgets/revertform_impl.h b/src/ksvnwidgets/revertform_impl.h index 1cf7cd6..52de65e 100644 --- a/src/ksvnwidgets/revertform_impl.h +++ b/src/ksvnwidgets/revertform_impl.h @@ -23,16 +23,17 @@ #include "src/ksvnwidgets/revertform.h" #include "src/svnqt/svnqttypes.hpp" -class QStringList; +class TQStringList; class RevertFormImpl:public RevertForm { Q_OBJECT + TQ_OBJECT public: - RevertFormImpl(QWidget*parent=0,const char*name=0); + RevertFormImpl(TQWidget*tqparent=0,const char*name=0); virtual ~RevertFormImpl(); svn::Depth getDepth()const; - void setDispList(const QStringList&_list); + void setDispList(const TQStringList&_list); }; #endif diff --git a/src/ksvnwidgets/ssltrustprompt.ui b/src/ksvnwidgets/ssltrustprompt.ui index 2cfb488..7e363d0 100644 --- a/src/ksvnwidgets/ssltrustprompt.ui +++ b/src/ksvnwidgets/ssltrustprompt.ui @@ -1,10 +1,10 @@ SslTrustPrompt - + SslTrustPrompt - + 0 0 @@ -16,7 +16,7 @@ unnamed - + m_MainLabel @@ -33,7 +33,7 @@ - + ktextbrowser.h diff --git a/src/ksvnwidgets/ssltrustprompt_impl.cpp b/src/ksvnwidgets/ssltrustprompt_impl.cpp index 795fe66..84b0d15 100644 --- a/src/ksvnwidgets/ssltrustprompt_impl.cpp +++ b/src/ksvnwidgets/ssltrustprompt_impl.cpp @@ -21,9 +21,9 @@ #include "src/settings/kdesvnsettings.h" #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -32,19 +32,19 @@ #include #include -SslTrustPrompt_impl::SslTrustPrompt_impl(const QString&host,QWidget *parent, const char *name) - :SslTrustPrompt(parent, name) +SslTrustPrompt_impl::SslTrustPrompt_impl(const TQString&host,TQWidget *tqparent, const char *name) + :SslTrustPrompt(tqparent, name) { m_MainLabel->setText("

"+ - i18n("Error validating server certificate for '%1'").arg(host)+ - QString("

")); + i18n("Error validating server certificate for '%1'").tqarg(host)+ + TQString("

")); } /*! - \fn SslTrustPrompt_impl::sslTrust(const QString&host,const QString&fingerprint,const QString&validFrom,const QString&validUntil,const QString&issuerName,const QString&realm,bool*ok,bool*saveit) + \fn SslTrustPrompt_impl::sslTrust(const TQString&host,const TQString&fingerprint,const TQString&validFrom,const TQString&validUntil,const TQString&issuerName,const TQString&realm,bool*ok,bool*saveit) */ -bool SslTrustPrompt_impl::sslTrust(const QString&host,const QString&fingerprint,const QString&validFrom,const QString&validUntil,const QString&issuerName,const QString&realm,const QStringList&reasons,bool*ok,bool*saveit) +bool SslTrustPrompt_impl::sslTrust(const TQString&host,const TQString&fingerprint,const TQString&validFrom,const TQString&validUntil,const TQString&issuerName,const TQString&realm,const TQStringList&reasons,bool*ok,bool*saveit) { SslTrustPrompt_impl*ptr=0; KDialogBase dlg(i18n("Trust ssl certificate")); @@ -52,10 +52,10 @@ bool SslTrustPrompt_impl::sslTrust(const QString&host,const QString&fingerprint, dlg.setButtonText(KDialogBase::No,i18n("Accept temporarily")); dlg.setButtonCancel(KGuiItem(i18n("Reject"))); - static QString rb = ""; - static QString rs = ""; - static QString re = ""; - QString text = ""; + static TQString rb = ""; + static TQString rs = ""; + static TQString re = ""; + TQString text = ""; if (reasons.count()>0) { text+="

"; text+="

"+i18n("Failure reasons")+"

"; @@ -74,7 +74,7 @@ bool SslTrustPrompt_impl::sslTrust(const QString&host,const QString&fingerprint, text+=rb+i18n("Fingerprint")+rs+fingerprint+re; text+="

"; - QWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()),"trustssldlg")); ptr = new SslTrustPrompt_impl(host,Dialog1Layout); ptr->m_ContentText->setText(text); diff --git a/src/ksvnwidgets/ssltrustprompt_impl.h b/src/ksvnwidgets/ssltrustprompt_impl.h index 5ea5cd3..5d4d492 100644 --- a/src/ksvnwidgets/ssltrustprompt_impl.h +++ b/src/ksvnwidgets/ssltrustprompt_impl.h @@ -24,9 +24,10 @@ class SslTrustPrompt_impl: public SslTrustPrompt { Q_OBJECT + TQ_OBJECT public: - SslTrustPrompt_impl(const QString&,QWidget *parent = 0, const char *name = 0); - static bool sslTrust(const QString&host,const QString&fingerprint,const QString&validFrom,const QString&validUntil,const QString&issuerName,const QString&realm,const QStringList&reasons,bool*ok,bool*saveit); + SslTrustPrompt_impl(const TQString&,TQWidget *tqparent = 0, const char *name = 0); + static bool sslTrust(const TQString&host,const TQString&fingerprint,const TQString&validFrom,const TQString&validUntil,const TQString&issuerName,const TQString&realm,const TQStringList&reasons,bool*ok,bool*saveit); }; #endif -- cgit v1.2.1