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/svnlogdlgimp.cpp | 224 +++++++++++++++++++-------------------- 1 file changed, 112 insertions(+), 112 deletions(-) (limited to 'src/svnfrontend/svnlogdlgimp.cpp') diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp index 9919ab7..6bc1a23 100644 --- a/src/svnfrontend/svnlogdlgimp.cpp +++ b/src/svnfrontend/svnlogdlgimp.cpp @@ -35,11 +35,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -49,26 +49,26 @@ const char* SvnLogDlgImp::groupName = "log_dialog_size"; class LogListViewItem:public KListViewItem { public: - LogListViewItem (KListView *parent,const svn::LogEntry&); - virtual int compare( QListViewItem* i, int col, bool ascending ) const; + LogListViewItem (KListView *tqparent,const svn::LogEntry&); + virtual int compare( TQListViewItem* i, int col, bool ascending ) const; static const int COL_MARKER,COL_REV,COL_AUTHOR,COL_DATE,COL_MSG; - const QString&message()const; + const TQString&message()const; svn_revnum_t rev()const{return _revision;} void showChangedEntries(KListView*); unsigned int numChangedEntries(){return changedPaths.count();} void setChangedEntries(const svn::LogEntry&); - void setRealName(const QString&_n){_realName=_n;} - const QString&realName()const{return _realName;} + void setRealName(const TQString&_n){_realName=_n;} + const TQString&realName()const{return _realName;} - bool copiedFrom(QString&_n,long&rev)const; - static bool isParent(const QString&_par,const QString&tar); + bool copiedFrom(TQString&_n,long&rev)const; + static bool isParent(const TQString&_par,const TQString&tar); protected: svn_revnum_t _revision; - QDateTime fullDate; - QString _message,_realName; - QValueList changedPaths; + TQDateTime fullDate; + TQString _message,_realName; + TQValueList changedPaths; }; const int LogListViewItem::COL_MARKER = 0; @@ -80,31 +80,31 @@ const int LogListViewItem::COL_MSG = 4; class LogChangePathItem:public KListViewItem { public: - LogChangePathItem(KListView*parent,const svn::LogChangePathEntry&); + LogChangePathItem(KListView*tqparent,const svn::LogChangePathEntry&); virtual ~LogChangePathItem(){} - QChar action() const{return _action;} - const QString& path() const{return _path;} - const QString& source() const{return _source;} + TQChar action() const{return _action;} + const TQString& path() const{return _path;} + const TQString& source() const{return _source;} svn_revnum_t revision() const{ return _revision;} protected: - QString _path,_source; - QChar _action; + TQString _path,_source; + TQChar _action; svn_revnum_t _revision; }; -LogListViewItem::LogListViewItem(KListView*_parent,const svn::LogEntry&_entry) - : KListViewItem(_parent),_realName(QString::null) +LogListViewItem::LogListViewItem(KListView*_tqparent,const svn::LogEntry&_entry) + : KListViewItem(_tqparent),_realName(TQString()) { setMultiLinesEnabled(false); _revision=_entry.revision; fullDate=svn::DateTime(_entry.date); - setText(COL_REV,QString("%1").arg(_revision)); + setText(COL_REV,TQString("%1").tqarg(_revision)); setText(COL_AUTHOR,_entry.author); setText(COL_DATE,helpers::sub2qt::apr_time2qtString(_entry.date)); _message = _entry.message; - QStringList sp = QStringList::split("\n",_message); + TQStringList sp = TQStringList::split("\n",_message); if (sp.count()==0) { setText(COL_MSG,_message); } else { @@ -114,12 +114,12 @@ LogListViewItem::LogListViewItem(KListView*_parent,const svn::LogEntry&_entry) //setText(COL_MSG,_entry.message.c_str()); } -const QString&LogListViewItem::message()const +const TQString&LogListViewItem::message()const { return _message; } -int LogListViewItem::compare( QListViewItem* item, int col, bool ) const +int LogListViewItem::compare( TQListViewItem* item, int col, bool ) const { LogListViewItem* k = static_cast( item ); if (col==COL_REV) { @@ -143,10 +143,10 @@ void LogListViewItem::showChangedEntries(KListView*where) } } -LogChangePathItem::LogChangePathItem(KListView*parent,const svn::LogChangePathEntry&e) - :KListViewItem(parent) +LogChangePathItem::LogChangePathItem(KListView*tqparent,const svn::LogChangePathEntry&e) + :KListViewItem(tqparent) { - _action = QChar(e.action); + _action = TQChar(e.action); setText(0,_action); _path = e.path; setText(1,e.path); @@ -154,7 +154,7 @@ LogChangePathItem::LogChangePathItem(KListView*parent,const svn::LogChangePathEn _source = e.copyFromPath; if (e.copyFromRevision>-1) { - setText(2,i18n("%1 at revision %2").arg(e.copyFromPath).arg(e.copyFromRevision)); + setText(2,i18n("%1 at revision %2").tqarg(e.copyFromPath).tqarg(e.copyFromRevision)); } } @@ -163,15 +163,15 @@ void LogListViewItem::setChangedEntries(const svn::LogEntry&_entry) changedPaths = _entry.changedPaths; } -bool LogListViewItem::copiedFrom(QString&_n,long&_rev)const +bool LogListViewItem::copiedFrom(TQString&_n,long&_rev)const { for (unsigned i = 0; i < changedPaths.count();++i) { if (changedPaths[i].action=='A' && !changedPaths[i].copyFromPath.isEmpty() && isParent(changedPaths[i].path,_realName)) { kdDebug()<<_realName<< " - " << changedPaths[i].path << endl; - QString tmpPath = _realName; - QString r = _realName.mid(changedPaths[i].path.length()); + TQString tmpPath = _realName; + TQString r = _realName.mid(changedPaths[i].path.length()); _n=changedPaths[i].copyFromPath; _n+=r; _rev = changedPaths[i].copyFromRevision; @@ -183,18 +183,18 @@ bool LogListViewItem::copiedFrom(QString&_n,long&_rev)const return false; } -bool LogListViewItem::isParent(const QString&_par,const QString&tar) +bool LogListViewItem::isParent(const TQString&_par,const TQString&tar) { if (_par==tar) return true; - QString par = _par+(_par.endsWith("/")?"":"/"); + TQString par = _par+(_par.endsWith("/")?"":"/"); return tar.startsWith(par); } -SvnLogDlgImp::SvnLogDlgImp(SvnActions*ac,QWidget *parent, const char *name,bool modal) - :SvnLogDialogData(parent, name,modal),_name("") +SvnLogDlgImp::SvnLogDlgImp(SvnActions*ac,TQWidget *tqparent, const char *name,bool modal) + :SvnLogDialogData(tqparent, name,modal),_name("") { m_LogView->setSorting(LogListViewItem::COL_REV); - m_LogView->setSortOrder(Qt::Descending); + m_LogView->setSortOrder(TQt::Descending); resize(dialogSize()); m_ControlKeyDown = false; m_first = 0; @@ -207,15 +207,15 @@ SvnLogDlgImp::SvnLogDlgImp(SvnActions*ac,QWidget *parent, const char *name,bool } m_Actions = ac; KConfigGroup cs(Kdesvnsettings::self()->config(), groupName); - QString t1 = cs.readEntry("logsplitter",QString::null); + TQString t1 = cs.readEntry("logsplitter",TQString()); if (!t1.isEmpty()) { - QTextStream st2(&t1,IO_ReadOnly); + TQTextStream st2(&t1,IO_ReadOnly); st2 >> *m_centralSplitter; } - t1 = cs.readEntry("right_logsplitter",QString::null); + t1 = cs.readEntry("right_logsplitter",TQString()); if (!t1.isEmpty()) { if (cs.readBoolEntry("laststate",false)==m_ChangedList->isHidden()) { - QTextStream st2(&t1,IO_ReadOnly); + TQTextStream st2(&t1,IO_ReadOnly); st2 >> *m_rightSplitter; } } @@ -223,10 +223,10 @@ SvnLogDlgImp::SvnLogDlgImp(SvnActions*ac,QWidget *parent, const char *name,bool SvnLogDlgImp::~SvnLogDlgImp() { - QString t1,t2; - QTextStream st1(&t1,IO_WriteOnly); + TQString t1,t2; + TQTextStream st1(&t1,IO_WriteOnly); st1 << *m_rightSplitter; - QTextStream st2(&t2,IO_WriteOnly); + TQTextStream st2(&t2,IO_WriteOnly); st2 << *m_centralSplitter; KConfigGroup cs(Kdesvnsettings::self()->config(), groupName); cs.writeEntry("right_logsplitter",t1); @@ -234,7 +234,7 @@ SvnLogDlgImp::~SvnLogDlgImp() cs.writeEntry("laststate",m_ChangedList->isHidden()); } -void SvnLogDlgImp::dispLog(const svn::SharedPointer&_log,const QString & what,const QString&root,const svn::Revision&peg,const QString&pegUrl) +void SvnLogDlgImp::dispLog(const svn::SharedPointer&_log,const TQString & what,const TQString&root,const svn::Revision&peg,const TQString&pegUrl) { m_peg = peg; m_PegUrl = pegUrl; @@ -242,12 +242,12 @@ void SvnLogDlgImp::dispLog(const svn::SharedPointer&_log,con m_startRevButton->setNoWorking(m_PegUrl.isUrl()); m_endRevButton->setNoWorking(m_PegUrl.isUrl()); if (!m_PegUrl.isUrl() || Kdesvnsettings::remote_special_properties()) { - QString s = m_Actions->searchProperty(_bugurl,"bugtraq:url",pegUrl,peg,true); + TQString s = m_Actions->searchProperty(_bugurl,"bugtraq:url",pegUrl,peg,true); if (!s.isEmpty() ){ - QString reg; + TQString reg; s = m_Actions->searchProperty(reg,"bugtraq:logregex",pegUrl,peg,true); if (!s.isNull() && !reg.isEmpty()) { - QStringList s1 = QStringList::split("\n",reg); + TQStringList s1 = TQStringList::split("\n",reg); if (s1.size()>0) { _r1.setPattern(s1[0]); if (s1.size()>1) { @@ -262,7 +262,7 @@ void SvnLogDlgImp::dispLog(const svn::SharedPointer&_log,con m_Entries = _log; kdDebug()<<"What: "<&_log) } svn::LogEntriesMap::const_iterator lit; LogListViewItem * item; - QMap namesMap; - QMap itemMap; + TQMap namesMap; + TQMap itemMap; long min,max; min = max = -1; for (lit=_log->begin();lit!=_log->end();++lit) { @@ -296,12 +296,12 @@ void SvnLogDlgImp::dispLog(const svn::SharedPointer&_log) m_startRevButton->setRevision(max); m_endRevButton->setRevision(min); m_LogView->setSelected(m_LogView->firstChild(),true); - QString bef = _name; + TQString bef = _name; long rev; // YES! I'd checked it: this is much faster than getting list of keys // and iterating over that list! for (long c=max;c>-1;--c) { - if (!itemMap.contains(c)) { + if (!itemMap.tqcontains(c)) { continue; } if (itemMap[c]->realName().isEmpty()) { @@ -311,15 +311,15 @@ void SvnLogDlgImp::dispLog(const svn::SharedPointer&_log) } } -QString SvnLogDlgImp::genReplace(const QString&r1match) +TQString SvnLogDlgImp::genReplace(const TQString&r1match) { - static QString anf(""); - static QString end(""); - QString res(""); + static TQString anf(""); + static TQString end(""); + TQString res(""); if (_r2.pattern().length()<1) { res = _bugurl; - res.replace("%BUGID%",_r1.cap(1)); + res.tqreplace("%BUGID%",_r1.cap(1)); res = anf+res+mid+r1match+end; return res; } @@ -327,32 +327,32 @@ QString SvnLogDlgImp::genReplace(const QString&r1match) int count=0; int oldpos; - kdDebug()<<"Search second pattern: "<<_r2.pattern()<<" in "< -1) { oldpos = pos+count; - pos = r1match.find(_r2,pos+count); + pos = r1match.tqfind(_r2,pos+count); if (pos==-1) { break; } count = _r2.matchedLength(); res+=r1match.mid(oldpos,pos-oldpos); - QString sub = r1match.mid(pos,count); - QString _url = _bugurl; - _url.replace("%BUGID%",sub); + TQString sub = r1match.mid(pos,count); + TQString _url = _bugurl; + _url.tqreplace("%BUGID%",sub); res+=anf+_url+mid+sub+end; } res+=r1match.mid(oldpos); return res; } -void SvnLogDlgImp::replaceBugids(QString&msg) +void SvnLogDlgImp::replaceBugids(TQString&msg) { - msg = QStyleSheet::convertFromPlainText(msg); + msg = TQStyleSheet::convertFromPlainText(msg); if (!_r1.isValid() || _r1.pattern().length()<1 || _bugurl.isEmpty()) { return; } - kdDebug()<<"Try match "<< _r1.pattern() << endl; + kdDebug()<<"Try match "<< TQString(_r1.pattern()) << endl; int pos = 0; int count = 0; @@ -360,13 +360,13 @@ void SvnLogDlgImp::replaceBugids(QString&msg) count = _r1.matchedLength(); while (pos>-1) { - kdDebug()<<"Found at "<setEnabled(false); @@ -397,7 +397,7 @@ void SvnLogDlgImp::slotSelectionChanged(QListViewItem*_it) m_ChangedList->show(); } } - QString msg = k->message(); + TQString msg = k->message(); replaceBugids(msg); m_LogDisplay->setText(msg); @@ -428,7 +428,7 @@ void SvnLogDlgImp::slotDispPrevious() m_DispPrevButton->setEnabled(false); return; } - QString s,e; + TQString s,e; s = _base+k->realName(); e = _base+p->realName(); emit makeDiff(e,p->rev(),s,k->rev(),this); @@ -440,30 +440,30 @@ void SvnLogDlgImp::slotDispPrevious() */ void SvnLogDlgImp::saveSize() { - int scnum = QApplication::desktop()->screenNumber(parentWidget()); - QRect desk = QApplication::desktop()->screenGeometry(scnum); + int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + TQRect desk = TQApplication::desktop()->screenGeometry(scnum); KConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName); - QSize sizeToSave = size(); - Kdesvnsettings::self()->config()->writeEntry( QString::fromLatin1("Width %1").arg( desk.width()), - QString::number( sizeToSave.width()), true, false); - Kdesvnsettings::self()->config()->writeEntry( QString::fromLatin1("Height %1").arg( desk.height()), - QString::number( sizeToSave.height()), true, false); + TQSize sizeToSave = size(); + Kdesvnsettings::self()->config()->writeEntry( TQString::tqfromLatin1("Width %1").tqarg( desk.width()), + TQString::number( sizeToSave.width()), true, false); + Kdesvnsettings::self()->config()->writeEntry( TQString::tqfromLatin1("Height %1").tqarg( desk.height()), + TQString::number( sizeToSave.height()), true, false); } -QSize SvnLogDlgImp::dialogSize() +TQSize SvnLogDlgImp::dialogSize() { int w, h; - int scnum = QApplication::desktop()->screenNumber(parentWidget()); - QRect desk = QApplication::desktop()->screenGeometry(scnum); - w = sizeHint().width(); - h = sizeHint().height(); + int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + TQRect desk = TQApplication::desktop()->screenGeometry(scnum); + w = tqsizeHint().width(); + h = tqsizeHint().height(); KConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName); - w = Kdesvnsettings::self()->config()->readNumEntry( QString::fromLatin1("Width %1").arg( desk.width()), w ); - h = Kdesvnsettings::self()->config()->readNumEntry( QString::fromLatin1("Height %1").arg( desk.height()), h ); - return( QSize( w, h ) ); + w = Kdesvnsettings::self()->config()->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg( desk.width()), w ); + h = Kdesvnsettings::self()->config()->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg( desk.height()), h ); + return( TQSize( w, h ) ); } -void SvnLogDlgImp::slotItemClicked(int button,QListViewItem*item,const QPoint &,int) +void SvnLogDlgImp::slotItemClicked(int button,TQListViewItem*item,const TQPoint &,int) { if (!item) { m_ChangedList->clear(); @@ -513,10 +513,10 @@ void SvnLogDlgImp::slotDispSelected() emit makeDiff(_base+m_first->realName(),m_first->rev(),_base+m_second->realName(),m_second->rev(),this); } -bool SvnLogDlgImp::getSingleLog(svn::LogEntry&t,const svn::Revision&r,const QString&what,const svn::Revision&peg,QString&root) +bool SvnLogDlgImp::getSingleLog(svn::LogEntry&t,const svn::Revision&r,const TQString&what,const svn::Revision&peg,TQString&root) { root = _base; - if (m_Entries->find(r.revnum()) == m_Entries->end()) + if (m_Entries->tqfind(r.revnum()) == m_Entries->end()) { return m_Actions->getSingleLog(t,r,what,peg,root); } @@ -554,7 +554,7 @@ void SvnLogDlgImp::slotListEntries() buttonListFiles->setEnabled(false); } -void SvnLogDlgImp::keyPressEvent (QKeyEvent * e) +void SvnLogDlgImp::keyPressEvent (TQKeyEvent * e) { if (!e) return; if (e->text().isEmpty()&&e->key()==Key_Control) { @@ -563,10 +563,10 @@ void SvnLogDlgImp::keyPressEvent (QKeyEvent * e) SvnLogDialogData::keyPressEvent(e); } -void SvnLogDlgImp::keyReleaseEvent (QKeyEvent * e) +void SvnLogDlgImp::keyReleaseEvent (TQKeyEvent * e) { if (!e) return; - if (e->text().isEmpty()&&e->key()==Qt::Key_Control) { + if (e->text().isEmpty()&&e->key()==TQt::Key_Control) { m_ControlKeyDown = false; } SvnLogDialogData::keyReleaseEvent(e); @@ -580,14 +580,14 @@ void SvnLogDlgImp::slotBlameItem() return; } svn::Revision start(svn::Revision::START); - m_Actions->makeBlame(start,k->rev(),_base+k->realName(),kapp->activeModalWidget(),k->rev(),this); + m_Actions->makeBlame(start,k->rev(),_base+k->realName(),TQT_TQWIDGET(kapp->activeModalWidget()),k->rev(),this); } void SvnLogDlgImp::slotEntriesSelectionChanged() { } -void SvnLogDlgImp::slotSingleContext(QListViewItem*_item, const QPoint & e, int) +void SvnLogDlgImp::slotSingleContext(TQListViewItem*_item, const TQPoint & e, int) { if (!_item) { @@ -600,10 +600,10 @@ void SvnLogDlgImp::slotSingleContext(QListViewItem*_item, const QPoint & e, int) kdDebug()<<"????"<path(); - QString action = item->action(); - QString source =item->revision()>-1?item->source():item->path(); + TQPopupMenu popup; + TQString name = item->path(); + TQString action = item->action(); + TQString source =item->revision()>-1?item->source():item->path(); svn_revnum_t prev = item->revision()>0?item->revision():k->rev()-1; if (action != "D") { popup.insertItem(i18n("Annotate"),101); @@ -618,7 +618,7 @@ void SvnLogDlgImp::slotSingleContext(QListViewItem*_item, const QPoint & e, int) { case 101: { - m_Actions->makeBlame(start,k->rev(),_base+name,kapp->activeModalWidget(),k->rev(),this); + m_Actions->makeBlame(start,k->rev(),_base+name,TQT_TQWIDGET(kapp->activeModalWidget()),k->rev(),this); break; } case 102: @@ -628,14 +628,14 @@ void SvnLogDlgImp::slotSingleContext(QListViewItem*_item, const QPoint & e, int) } case 103: { - emit makeCat(k->rev(),_base+source,source,k->rev(),kapp->activeModalWidget()); + emit makeCat(k->rev(),_base+source,source,k->rev(),TQT_TQWIDGET(kapp->activeModalWidget())); } default: break; } } -void SvnLogDlgImp::slotSingleDoubleClicked(QListViewItem*_item) +void SvnLogDlgImp::slotSingleDoubleClicked(TQListViewItem*_item) { if (!_item) { @@ -648,13 +648,13 @@ void SvnLogDlgImp::slotSingleDoubleClicked(QListViewItem*_item) kdDebug()<<"????"<path(); - QString action = item->action(); - QString source =item->revision()>-1?item->source():item->path(); + TQString name = item->path(); + TQString action = item->action(); + TQString source =item->revision()>-1?item->source():item->path(); //svn_revnum_t prev = item->revision()>0?item->revision():k->rev()-1; svn::Revision start(svn::Revision::START); if (action != "D") { - m_Actions->makeBlame(start,k->rev(),_base+name,kapp->activeModalWidget(),k->rev(),this); + m_Actions->makeBlame(start,k->rev(),_base+name,TQT_TQWIDGET(kapp->activeModalWidget()),k->rev(),this); } } -- cgit v1.2.1