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/svnfrontend/fronthelpers/checkoutinfo.ui | 38 +++++++++++----------- src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp | 32 +++++++++--------- src/svnfrontend/fronthelpers/checkoutinfo_impl.h | 13 ++++---- src/svnfrontend/fronthelpers/cursorstack.h | 6 ++-- src/svnfrontend/fronthelpers/propertyitem.cpp | 12 +++---- src/svnfrontend/fronthelpers/propertyitem.h | 16 ++++----- src/svnfrontend/fronthelpers/propertylist.cpp | 36 ++++++++++---------- src/svnfrontend/fronthelpers/propertylist.h | 17 +++++----- src/svnfrontend/fronthelpers/rangeinput.ui | 34 +++++++++---------- src/svnfrontend/fronthelpers/rangeinput_impl.cpp | 20 ++++++------ src/svnfrontend/fronthelpers/rangeinput_impl.h | 7 ++-- src/svnfrontend/fronthelpers/revisionbutton.ui | 10 +++--- .../fronthelpers/revisionbuttonimpl.cpp | 12 +++---- src/svnfrontend/fronthelpers/revisionbuttonimpl.h | 3 +- src/svnfrontend/fronthelpers/widgetblockstack.cpp | 4 +-- src/svnfrontend/fronthelpers/widgetblockstack.h | 6 ++-- 16 files changed, 135 insertions(+), 131 deletions(-) (limited to 'src/svnfrontend/fronthelpers') diff --git a/src/svnfrontend/fronthelpers/checkoutinfo.ui b/src/svnfrontend/fronthelpers/checkoutinfo.ui index a880bd3..77e1398 100644 --- a/src/svnfrontend/fronthelpers/checkoutinfo.ui +++ b/src/svnfrontend/fronthelpers/checkoutinfo.ui @@ -1,10 +1,10 @@ CheckoutInfo - + CheckoutInfo - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout2 + tqlayout2 @@ -38,7 +38,7 @@ 18 - + m_TargetLabel @@ -57,14 +57,14 @@ 18 - + m_UrlLabel Enter URL: - + AlignVCenter|AlignRight @@ -83,7 +83,7 @@ - + m_CreateDirButton @@ -94,15 +94,15 @@ true - + - layout2 + tqlayout2 unnamed - + m_overwriteButton @@ -119,7 +119,7 @@ May existing unversioned items ovewritten - + m_ignoreExternals @@ -132,9 +132,9 @@ - + - layout4 + tqlayout4 @@ -144,14 +144,14 @@ m_DepthSelector - + 20 20 - + m_ShowExplorer @@ -206,10 +206,10 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082 - + urlChanged(const QString&) - - + + kurlrequester.h klineedit.h diff --git a/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp b/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp index 8d207e7..46b6452 100644 --- a/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp +++ b/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp @@ -23,16 +23,16 @@ #include "src/svnqt/url.hpp" #include "helpers/ktranslateurl.h" #include -#include -#include +#include +#include #include -#include +#include #include #include -CheckoutInfo_impl::CheckoutInfo_impl(QWidget *parent, const char *name) - :CheckoutInfo(parent, name) +CheckoutInfo_impl::CheckoutInfo_impl(TQWidget *tqparent, const char *name) + :CheckoutInfo(tqparent, name) { m_RangeInput->setStartOnly(true); m_RangeInput->setHeadDefault(); @@ -47,10 +47,10 @@ svn::Revision CheckoutInfo_impl::toRevision() return m_RangeInput->getRange().first; } -QString CheckoutInfo_impl::reposURL() +TQString CheckoutInfo_impl::reposURL() { KURL uri(m_UrlEdit->url()); - QString proto = svn::Url::transformProtokoll(uri.protocol()); + TQString proto = svn::Url::transformProtokoll(uri.protocol()); if (proto=="file"&&!m_UrlEdit->url().startsWith("ksvn+file:")) { uri.setProtocol(""); } else { @@ -59,16 +59,16 @@ QString CheckoutInfo_impl::reposURL() return uri.prettyURL(); } -QString CheckoutInfo_impl::targetDir() +TQString CheckoutInfo_impl::targetDir() { if (!m_CreateDirButton->isChecked()) { return m_TargetSelector->url(); } - QString _uri = reposURL(); + TQString _uri = reposURL(); while (_uri.endsWith("/")) { _uri.truncate(_uri.length()-1); } - QStringList l = QStringList::split('/',_uri); + TQStringList l = TQStringList::split('/',_uri); if (l.count()==0) { return m_TargetSelector->url(); } @@ -81,14 +81,14 @@ bool CheckoutInfo_impl::overwrite() } /*! - \fn CheckoutInfo_impl::setTargetUrl(const QString&) + \fn CheckoutInfo_impl::setTargetUrl(const TQString&) */ -void CheckoutInfo_impl::setTargetUrl(const QString&what) +void CheckoutInfo_impl::setTargetUrl(const TQString&what) { m_TargetSelector->setURL(what); } -void CheckoutInfo_impl::setStartUrl(const QString&what) +void CheckoutInfo_impl::setStartUrl(const TQString&what) { KURL uri(what); if (uri.protocol()=="file") { @@ -109,14 +109,14 @@ void CheckoutInfo_impl::hideDepth(bool how,bool overwriteAsRecurse) m_DepthSelector->setEnabled(false); m_DepthSelector->hide(); if (overwriteAsRecurse) { - QToolTip::add( m_overwriteButton, i18n( "Make operation recursive." ) ); + TQToolTip::add( m_overwriteButton, i18n( "Make operation recursive." ) ); m_overwriteButton->setText(i18n("Recursive")); } } else if (!how) { m_DepthSelector->setEnabled(false); m_DepthSelector->show(); m_overwriteButton->setText( tr2i18n( "Overwrite existing" ) ); - QToolTip::add( m_overwriteButton, tr2i18n( "May existing unversioned items ovewritten" ) ); + TQToolTip::add( m_overwriteButton, tr2i18n( "May existing unversioned items ovewritten" ) ); } adjustSize(); } @@ -176,7 +176,7 @@ void CheckoutInfo_impl::disableRange(bool how) } } -void CheckoutInfo_impl::urlChanged(const QString&) +void CheckoutInfo_impl::urlChanged(const TQString&) { } diff --git a/src/svnfrontend/fronthelpers/checkoutinfo_impl.h b/src/svnfrontend/fronthelpers/checkoutinfo_impl.h index 600e179..1816c74 100644 --- a/src/svnfrontend/fronthelpers/checkoutinfo_impl.h +++ b/src/svnfrontend/fronthelpers/checkoutinfo_impl.h @@ -27,17 +27,18 @@ class CheckoutInfo_impl: public CheckoutInfo { Q_OBJECT + TQ_OBJECT public: - CheckoutInfo_impl(QWidget *parent = 0, const char *name = 0); + CheckoutInfo_impl(TQWidget *tqparent = 0, const char *name = 0); virtual ~CheckoutInfo_impl(); svn::Revision toRevision(); - QString reposURL(); - QString targetDir(); + TQString reposURL(); + TQString targetDir(); bool overwrite(); svn::Depth getDepth(); - void setStartUrl(const QString&); + void setStartUrl(const TQString&); void disableForce(bool how); void disableTargetDir(bool how); @@ -46,11 +47,11 @@ public: void disableExternals(bool how); bool openAfterJob(); virtual void disableRange(bool how); - void setTargetUrl(const QString&); + void setTargetUrl(const TQString&); bool ignoreExternals(); void hideDepth(bool hide,bool overwriteAsRecurse); protected slots: - virtual void urlChanged(const QString&); + virtual void urlChanged(const TQString&); }; #endif diff --git a/src/svnfrontend/fronthelpers/cursorstack.h b/src/svnfrontend/fronthelpers/cursorstack.h index 471af6e..4daf061 100644 --- a/src/svnfrontend/fronthelpers/cursorstack.h +++ b/src/svnfrontend/fronthelpers/cursorstack.h @@ -25,7 +25,7 @@ #define __CURSOR_STACK_H #include -#include +#include //! Change cursor on stack. /*! May used in methods where more than returns exists. Cursor will restored on destruction @@ -39,9 +39,9 @@ public: * Create instance and changes the application cursor to \a c * \param c cursortype to set. */ - CursorStack(Qt::CursorShape c = Qt::WaitCursor) + CursorStack(TQt::tqCursorShape c = TQt::WaitCursor) { - KApplication::setOverrideCursor(QCursor(c)); + KApplication::setOverrideCursor(TQCursor(c)); } //! Destructor. /*! diff --git a/src/svnfrontend/fronthelpers/propertyitem.cpp b/src/svnfrontend/fronthelpers/propertyitem.cpp index 0e25d5f..2e48324 100644 --- a/src/svnfrontend/fronthelpers/propertyitem.cpp +++ b/src/svnfrontend/fronthelpers/propertyitem.cpp @@ -2,16 +2,16 @@ #include #include -PropertyListViewItem::PropertyListViewItem(KListView *parent,const QString&aName,const QString&aValue) - : KListViewItem(parent),m_currentName(aName),m_startName(aName),m_currentValue(aValue),m_startValue(aValue),m_deleted(false) +PropertyListViewItem::PropertyListViewItem(KListView *tqparent,const TQString&aName,const TQString&aValue) + : KListViewItem(tqparent),m_currentName(aName),m_startName(aName),m_currentValue(aValue),m_startValue(aValue),m_deleted(false) { setMultiLinesEnabled(true); setText(0,startName()); setText(1,startValue()); } -PropertyListViewItem::PropertyListViewItem(KListView *parent) - : KListViewItem(parent),m_currentName(""),m_startName(""),m_currentValue(""),m_startValue(""),m_deleted(false) +PropertyListViewItem::PropertyListViewItem(KListView *tqparent) + : KListViewItem(tqparent),m_currentName(""),m_startName(""),m_currentValue(""),m_startValue(""),m_deleted(false) { setMultiLinesEnabled(true); setText(0,startName()); @@ -46,10 +46,10 @@ void PropertyListViewItem::deleteIt() void PropertyListViewItem::unDeleteIt() { m_deleted = false; - setPixmap(0,QPixmap()); + setPixmap(0,TQPixmap()); } -bool PropertyListViewItem::protected_Property(const QString&what) +bool PropertyListViewItem::protected_Property(const TQString&what) { if (what.compare("svn:special")!=0) return false; return true; diff --git a/src/svnfrontend/fronthelpers/propertyitem.h b/src/svnfrontend/fronthelpers/propertyitem.h index c630c7c..c72af05 100644 --- a/src/svnfrontend/fronthelpers/propertyitem.h +++ b/src/svnfrontend/fronthelpers/propertyitem.h @@ -13,14 +13,14 @@ class PropertyListViewItem:public KListViewItem public: static const int _RTTI_ = 1001; - PropertyListViewItem(KListView *parent,const QString&,const QString&); - PropertyListViewItem(KListView *parent); + PropertyListViewItem(KListView *tqparent,const TQString&,const TQString&); + PropertyListViewItem(KListView *tqparent); virtual ~PropertyListViewItem(); - const QString&startName()const{return m_startName;} - const QString&startValue()const{return m_startValue;} - const QString¤tName()const{return m_currentName;} - const QString¤tValue()const{return m_currentValue;} + const TQString&startName()const{return m_startName;} + const TQString&startValue()const{return m_startValue;} + const TQString¤tName()const{return m_currentName;} + const TQString¤tValue()const{return m_currentValue;} void checkValue(); void checkName(); @@ -39,10 +39,10 @@ class PropertyListViewItem:public KListViewItem * This moment it just checks for "svn:special" * \return true if protected property otherwise false */ - static bool protected_Property(const QString&); + static bool protected_Property(const TQString&); protected: - QString m_currentName,m_startName,m_currentValue,m_startValue; + TQString m_currentName,m_startName,m_currentValue,m_startValue; bool m_deleted; }; diff --git a/src/svnfrontend/fronthelpers/propertylist.cpp b/src/svnfrontend/fronthelpers/propertylist.cpp index 8fa3b66..118f281 100644 --- a/src/svnfrontend/fronthelpers/propertylist.cpp +++ b/src/svnfrontend/fronthelpers/propertylist.cpp @@ -25,8 +25,8 @@ #include -Propertylist::Propertylist(QWidget *parent, const char *name) - : KListView(parent, name),m_commitit(false) +Propertylist::Propertylist(TQWidget *tqparent, const char *name) + : KListView(tqparent, name),m_commitit(false) { addColumn(i18n("Property")); addColumn(i18n("Value")); @@ -35,10 +35,10 @@ Propertylist::Propertylist(QWidget *parent, const char *name) setRootIsDecorated(false); setSortColumn(0); setAcceptDrops(false); - connect(this,SIGNAL(itemRenamed(QListViewItem*,const QString&,int)),this,SLOT(slotItemRenamed(QListViewItem*,const QString&,int))); + connect(this,TQT_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)),this,TQT_SLOT(slotItemRenamed(TQListViewItem*,const TQString&,int))); - connect(this,SIGNAL(contextMenuRequested(QListViewItem *, const QPoint &, int)),this, - SLOT(slotContextMenuRequested(QListViewItem *, const QPoint &, int))); + connect(this,TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),this, + TQT_SLOT(slotContextMenuRequested(TQListViewItem *, const TQPoint &, int))); //setFullWidth( TRUE ); } @@ -47,7 +47,7 @@ Propertylist::~Propertylist() { } -void Propertylist::displayList(const svn::PathPropertiesMapListPtr&propList,bool editable,const QString&aCur) +void Propertylist::displayList(const svn::PathPropertiesMapListPtr&propList,bool editable,const TQString&aCur) { viewport()->setUpdatesEnabled(false); clear(); @@ -71,7 +71,7 @@ void Propertylist::displayList(const svn::PathPropertiesMapListPtr&propList,bool } } viewport()->setUpdatesEnabled(true); - viewport()->repaint(); + viewport()->tqrepaint(); } void Propertylist::clear() @@ -80,9 +80,9 @@ void Propertylist::clear() } /*! - \fn PropertiesDlg::slotItemRenamed(QListViewItem*item,const QString & str,int col ) + \fn PropertiesDlg::slotItemRenamed(TQListViewItem*item,const TQString & str,int col ) */ -void Propertylist::slotItemRenamed(QListViewItem*_item,const QString & text,int col ) +void Propertylist::slotItemRenamed(TQListViewItem*_item,const TQString & text,int col ) { if (!_item || _item->rtti()!=PropertyListViewItem::_RTTI_) return; PropertyListViewItem*item = static_cast (_item); @@ -119,7 +119,7 @@ void Propertylist::slotItemRenamed(QListViewItem*_item,const QString & text,int } if (commitchanges() && item->different()) { svn::PropertiesMap pm; - QValueList dels; + TQValueList dels; pm[item->currentName()]=item->currentValue(); if (item->currentName()!=item->startName()){ dels.push_back(item->startName()); @@ -128,12 +128,12 @@ void Propertylist::slotItemRenamed(QListViewItem*_item,const QString & text,int } } -bool Propertylist::checkExisting(const QString&aName,QListViewItem*it) +bool Propertylist::checkExisting(const TQString&aName,TQListViewItem*it) { if (!it) { - return findItem(aName,0)!=0; + return tqfindItem(aName,0)!=0; } - QListViewItemIterator iter(this); + TQListViewItemIterator iter(this); while ( iter.current() ) { if ( iter.current()==it) { ++iter; @@ -147,18 +147,18 @@ bool Propertylist::checkExisting(const QString&aName,QListViewItem*it) return false; } -void Propertylist::addCallback(QObject*ob) +void Propertylist::addCallback(TQObject*ob) { if (ob) { - connect(this,SIGNAL(sigSetProperty(const svn::PropertiesMap&,const QValueList&,const QString&)), - ob,SLOT(slotChangeProperties(const svn::PropertiesMap&,const QValueList&,const QString&))); + connect(this,TQT_SIGNAL(sigSetProperty(const svn::PropertiesMap&,const TQValueList&,const TQString&)), + ob,TQT_SLOT(slotChangeProperties(const svn::PropertiesMap&,const TQValueList&,const TQString&))); } } /*! - \fn Propertylist::slotContextMenuRequested(QListViewItem *, const QPoint &, int) + \fn Propertylist::slotContextMenuRequested(TQListViewItem *, const TQPoint &, int) */ -void Propertylist::slotContextMenuRequested(QListViewItem *, const QPoint &, int) +void Propertylist::slotContextMenuRequested(TQListViewItem *, const TQPoint &, int) { /// @todo implement me } diff --git a/src/svnfrontend/fronthelpers/propertylist.h b/src/svnfrontend/fronthelpers/propertylist.h index d3cf245..be4cd81 100644 --- a/src/svnfrontend/fronthelpers/propertylist.h +++ b/src/svnfrontend/fronthelpers/propertylist.h @@ -29,29 +29,30 @@ class Propertylist : public KListView { Q_OBJECT + TQ_OBJECT public: - Propertylist(QWidget *parent = 0, const char *name = 0); + Propertylist(TQWidget *tqparent = 0, const char *name = 0); ~Propertylist(); - bool checkExisting(const QString&aName,QListViewItem*it=0); + bool checkExisting(const TQString&aName,TQListViewItem*it=0); bool commitchanges()const{return m_commitit;} void setCommitchanges(bool how){m_commitit=how;} - void addCallback(QObject*); + void addCallback(TQObject*); public slots: - virtual void displayList(const svn::PathPropertiesMapListPtr&,bool,const QString&); + virtual void displayList(const svn::PathPropertiesMapListPtr&,bool,const TQString&); virtual void clear(); protected slots: - virtual void slotItemRenamed(QListViewItem*item,const QString & str,int col ); + virtual void slotItemRenamed(TQListViewItem*item,const TQString & str,int col ); signals: - void sigSetProperty(const svn::PropertiesMap&,const QValueList&,const QString&); + void sigSetProperty(const svn::PropertiesMap&,const TQValueList&,const TQString&); protected: bool m_commitit; - QString m_current; + TQString m_current; protected slots: - virtual void slotContextMenuRequested(QListViewItem *, const QPoint &, int); + virtual void slotContextMenuRequested(TQListViewItem *, const TQPoint &, int); }; #endif diff --git a/src/svnfrontend/fronthelpers/rangeinput.ui b/src/svnfrontend/fronthelpers/rangeinput.ui index 18e8884..b06e7da 100644 --- a/src/svnfrontend/fronthelpers/rangeinput.ui +++ b/src/svnfrontend/fronthelpers/rangeinput.ui @@ -1,10 +1,10 @@ RangeInputDlg - + RangeInput - + 0 0 @@ -19,7 +19,7 @@ unnamed - + m_startRevBox @@ -51,7 +51,7 @@ - + m_startNumberButton @@ -62,7 +62,7 @@ true - + m_startDateButton @@ -73,7 +73,7 @@ - + m_startStartButton @@ -86,7 +86,7 @@ m_startDateInput - + m_startHeadButton @@ -94,7 +94,7 @@ HEAD - + m_startWorkingButton @@ -107,7 +107,7 @@ - + m_stopRevBox @@ -139,7 +139,7 @@ - + m_stopNumberButton @@ -155,7 +155,7 @@ m_stopDateInput - + m_stopDateButton @@ -166,7 +166,7 @@ - + m_stopStartButton @@ -174,7 +174,7 @@ START - + m_stopHeadButton @@ -182,7 +182,7 @@ HEAD - + m_stopWorkingButton @@ -259,7 +259,7 @@ m_stopStartButton m_stopHeadButton - + stopHeadToggled(bool) stopBaseToggled(bool) stopNumberToggled(bool) @@ -268,8 +268,8 @@ startNumberToggled(bool) startDateToggled(bool) stopDateToggled(bool) - - + + knuminput.h knuminput.h diff --git a/src/svnfrontend/fronthelpers/rangeinput_impl.cpp b/src/svnfrontend/fronthelpers/rangeinput_impl.cpp index bf18bf9..e05e968 100644 --- a/src/svnfrontend/fronthelpers/rangeinput_impl.cpp +++ b/src/svnfrontend/fronthelpers/rangeinput_impl.cpp @@ -20,24 +20,24 @@ #include "rangeinput_impl.h" #include "helpers/sub2qt.h" -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include #include -Rangeinput_impl::Rangeinput_impl(QWidget *parent, const char *name) - :RangeInputDlg(parent, name) +Rangeinput_impl::Rangeinput_impl(TQWidget *tqparent, const char *name) + :RangeInputDlg(tqparent, name) { m_startRevInput->setRange(0,INT_MAX,1,false); m_endRevInput->setRange(0,INT_MAX,1,false); m_startRevInput->setValue(1); m_endRevInput->setValue(1); - m_startDateInput->setDateTime(QDateTime::currentDateTime ()); - m_stopDateInput->setDateTime(QDateTime::currentDateTime ()); + m_startDateInput->setDateTime(TQDateTime::tqcurrentDateTime ()); + m_stopDateInput->setDateTime(TQDateTime::tqcurrentDateTime ()); m_stopDateInput->setEnabled(false); m_startDateInput->setEnabled(false); m_stopHeadButton->setChecked(true); @@ -186,8 +186,8 @@ void Rangeinput_impl::setStartOnly(bool theValue) m_startRevBox->setTitle(i18n( "Start with revision" )); } updateGeometry(); - setMinimumSize(minimumSizeHint()); - resize( QSize(397, 272).expandedTo(minimumSizeHint()) ); + setMinimumSize(tqminimumSizeHint()); + resize( TQSize(397, 272).expandedTo(tqminimumSizeHint()) ); } #include "rangeinput_impl.moc" diff --git a/src/svnfrontend/fronthelpers/rangeinput_impl.h b/src/svnfrontend/fronthelpers/rangeinput_impl.h index a7ca29e..8be32c9 100644 --- a/src/svnfrontend/fronthelpers/rangeinput_impl.h +++ b/src/svnfrontend/fronthelpers/rangeinput_impl.h @@ -22,15 +22,16 @@ #include "rangeinput.h" #include "src/svnqt/revision.hpp" -#include +#include class Rangeinput_impl: public RangeInputDlg { Q_OBJECT + TQ_OBJECT public: - Rangeinput_impl(QWidget *parent = 0, const char *name = 0); + Rangeinput_impl(TQWidget *tqparent = 0, const char *name = 0); virtual ~Rangeinput_impl(); - typedef QPair revision_range; + typedef TQPair revision_range; revision_range getRange(); diff --git a/src/svnfrontend/fronthelpers/revisionbutton.ui b/src/svnfrontend/fronthelpers/revisionbutton.ui index 34b7b5a..efbf34b 100644 --- a/src/svnfrontend/fronthelpers/revisionbutton.ui +++ b/src/svnfrontend/fronthelpers/revisionbutton.ui @@ -1,10 +1,10 @@ RevisionButton - + RevisionButton - + 0 0 @@ -45,10 +45,10 @@ askRevision() - + askRevision() - - + + kpushbutton.h diff --git a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp index 15a2e6b..3d97dce 100644 --- a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp +++ b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp @@ -27,10 +27,10 @@ #include #include -#include +#include -RevisionButtonImpl::RevisionButtonImpl(QWidget *parent, const char *name) - :RevisionButton(parent, name),m_Rev(svn::Revision::UNDEFINED),m_noWorking(false) +RevisionButtonImpl::RevisionButtonImpl(TQWidget *tqparent, const char *name) + :RevisionButton(tqparent, name),m_Rev(svn::Revision::UNDEFINED),m_noWorking(false) { } @@ -50,17 +50,17 @@ void RevisionButtonImpl::askRevision() Rangeinput_impl*rdlg; int buttons = KDialogBase::Ok|KDialogBase::Cancel; - KDialogBase * dlg = new KDialogBase(KApplication::activeModalWidget(),"Revinput",true,i18n("Select revision"),buttons); + KDialogBase * dlg = new KDialogBase(TQT_TQWIDGET(KApplication::activeModalWidget()),"Revinput",true,i18n("Select revision"),buttons); if (!dlg) { return; } - QWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); rdlg = new Rangeinput_impl(Dialog1Layout); rdlg->setStartOnly(true); rdlg->setNoWorking(m_noWorking); dlg->resize(dlg->configDialogSize(*(Kdesvnsettings::self()->config()),"log_revisions_dlg")); - if (dlg->exec()==QDialog::Accepted) { + if (dlg->exec()==TQDialog::Accepted) { setRevision(rdlg->getRange().first); } dlg->saveDialogSize(*(Kdesvnsettings::self()->config()),"log_revisions_dlg",false); diff --git a/src/svnfrontend/fronthelpers/revisionbuttonimpl.h b/src/svnfrontend/fronthelpers/revisionbuttonimpl.h index a8f31a0..a2265b4 100644 --- a/src/svnfrontend/fronthelpers/revisionbuttonimpl.h +++ b/src/svnfrontend/fronthelpers/revisionbuttonimpl.h @@ -25,9 +25,10 @@ class RevisionButtonImpl: public RevisionButton { Q_OBJECT + TQ_OBJECT public: - RevisionButtonImpl(QWidget *parent = 0, const char *name = 0); + RevisionButtonImpl(TQWidget *tqparent = 0, const char *name = 0); virtual ~RevisionButtonImpl(); virtual void setRevision(const svn::Revision&aRev); diff --git a/src/svnfrontend/fronthelpers/widgetblockstack.cpp b/src/svnfrontend/fronthelpers/widgetblockstack.cpp index 9b8af8f..bd03faa 100644 --- a/src/svnfrontend/fronthelpers/widgetblockstack.cpp +++ b/src/svnfrontend/fronthelpers/widgetblockstack.cpp @@ -19,9 +19,9 @@ ***************************************************************************/ #include "widgetblockstack.h" -#include +#include -WidgetBlockStack::WidgetBlockStack(QWidget*w) +WidgetBlockStack::WidgetBlockStack(TQWidget*w) { if ( (_w=w)) { diff --git a/src/svnfrontend/fronthelpers/widgetblockstack.h b/src/svnfrontend/fronthelpers/widgetblockstack.h index 88d24c5..c223515 100644 --- a/src/svnfrontend/fronthelpers/widgetblockstack.h +++ b/src/svnfrontend/fronthelpers/widgetblockstack.h @@ -20,13 +20,13 @@ #ifndef __WIDGET_BLOCK_STACK_H #define __WIDGET_BLOCK_STACK_H -class QWidget; +class TQWidget; class WidgetBlockStack { - QWidget*_w; + TQWidget*_w; public: - WidgetBlockStack(QWidget*); + WidgetBlockStack(TQWidget*); ~WidgetBlockStack(); }; -- cgit v1.2.1