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/blamedisplay.ui | 22 +- src/svnfrontend/blamedisplay_impl.cpp | 168 ++--- src/svnfrontend/blamedisplay_impl.h | 17 +- src/svnfrontend/cacheentry.h | 120 ++-- src/svnfrontend/ccontextlistener.cpp | 96 +-- src/svnfrontend/ccontextlistener.h | 45 +- src/svnfrontend/commandexec.cpp | 224 +++--- src/svnfrontend/commandexec.h | 15 +- src/svnfrontend/copymoveview.ui | 24 +- src/svnfrontend/copymoveview_impl.cpp | 30 +- src/svnfrontend/copymoveview_impl.h | 13 +- src/svnfrontend/createrepo_dlg.ui | 34 +- src/svnfrontend/createrepo_impl.cpp | 12 +- src/svnfrontend/createrepo_impl.h | 7 +- src/svnfrontend/dummydisplay.cpp | 4 +- src/svnfrontend/dummydisplay.h | 4 +- src/svnfrontend/dumprepo_dlg.ui | 40 +- src/svnfrontend/dumprepo_impl.cpp | 14 +- src/svnfrontend/dumprepo_impl.h | 7 +- src/svnfrontend/editproperty_impl.cpp | 38 +- src/svnfrontend/editproperty_impl.h | 27 +- src/svnfrontend/editpropsdlg.ui | 42 +- src/svnfrontend/filelistviewitem.cpp | 88 +-- src/svnfrontend/filelistviewitem.h | 30 +- src/svnfrontend/fillcachethread.cpp | 26 +- src/svnfrontend/fillcachethread.h | 18 +- 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 +- src/svnfrontend/graphtree/drawparams.cpp | 92 +-- src/svnfrontend/graphtree/drawparams.h | 72 +- src/svnfrontend/graphtree/elogentry.cpp | 2 +- src/svnfrontend/graphtree/elogentry.h | 4 +- src/svnfrontend/graphtree/graphtreelabel.cpp | 70 +- src/svnfrontend/graphtree/graphtreelabel.h | 44 +- src/svnfrontend/graphtree/pannerview.cpp | 34 +- src/svnfrontend/graphtree/pannerview.h | 21 +- src/svnfrontend/graphtree/revgraphview.cpp | 326 ++++----- src/svnfrontend/graphtree/revgraphview.h | 71 +- src/svnfrontend/graphtree/revisiontree.cpp | 94 +-- src/svnfrontend/graphtree/revisiontree.h | 28 +- src/svnfrontend/graphtree/revtreewidget.cpp | 54 +- src/svnfrontend/graphtree/revtreewidget.h | 37 +- src/svnfrontend/hotcopydlg.ui | 20 +- src/svnfrontend/hotcopydlg_impl.cpp | 14 +- src/svnfrontend/hotcopydlg_impl.h | 9 +- src/svnfrontend/importdir_logmsg.cpp | 34 +- src/svnfrontend/importdir_logmsg.h | 13 +- src/svnfrontend/itemdisplay.cpp | 14 +- src/svnfrontend/itemdisplay.h | 24 +- src/svnfrontend/kdesvnfilelist.cpp | 778 ++++++++++----------- src/svnfrontend/kdesvnfilelist.h | 95 +-- src/svnfrontend/keystatus.cpp | 6 +- src/svnfrontend/keystatus.h | 2 +- src/svnfrontend/loaddmpdlg.ui | 34 +- src/svnfrontend/loaddmpdlg_impl.cpp | 28 +- src/svnfrontend/loaddmpdlg_impl.h | 9 +- src/svnfrontend/merge_dlg.ui | 46 +- src/svnfrontend/mergedlg_impl.cpp | 38 +- src/svnfrontend/mergedlg_impl.h | 17 +- src/svnfrontend/modifiedthread.cpp | 14 +- src/svnfrontend/modifiedthread.h | 16 +- src/svnfrontend/opencontextmenu.cpp | 18 +- src/svnfrontend/opencontextmenu.h | 11 +- src/svnfrontend/propertiesdlg.cpp | 62 +- src/svnfrontend/propertiesdlg.h | 37 +- src/svnfrontend/simple_logcb.h | 4 +- src/svnfrontend/stopdlg.cpp | 72 +- src/svnfrontend/stopdlg.h | 36 +- src/svnfrontend/svnactions.cpp | 764 ++++++++++---------- src/svnfrontend/svnactions.h | 179 ++--- src/svnfrontend/svnfiletip.cpp | 106 +-- src/svnfrontend/svnfiletip.h | 39 +- src/svnfrontend/svnitem.cpp | 120 ++-- src/svnfrontend/svnitem.h | 38 +- src/svnfrontend/svnlogdlg.ui | 60 +- src/svnfrontend/svnlogdlgimp.cpp | 224 +++--- src/svnfrontend/svnlogdlgimp.h | 41 +- src/svnfrontend/tcontextlistener.cpp | 80 +-- src/svnfrontend/tcontextlistener.h | 27 +- src/svnfrontend/threadcontextlistenerdata.h | 16 +- 94 files changed, 2776 insertions(+), 2749 deletions(-) (limited to 'src/svnfrontend') diff --git a/src/svnfrontend/blamedisplay.ui b/src/svnfrontend/blamedisplay.ui index 3f5a48c..19c3bb2 100644 --- a/src/svnfrontend/blamedisplay.ui +++ b/src/svnfrontend/blamedisplay.ui @@ -1,10 +1,10 @@ BlameDisplay - + BlameDisplay - + 0 0 @@ -86,22 +86,22 @@ m_BlameList - contextMenu(KListView*,QListViewItem*,const QPoint&) + contextMenu(KListView*,TQListViewItem*,const QPoint&) BlameDisplay - slotContextMenuRequested(KListView*,QListViewItem*,const QPoint&) + slotContextMenuRequested(KListView*,TQListViewItem*,const QPoint&) m_BlameList - doubleClicked(QListViewItem*) + doubleClicked(TQListViewItem*) BlameDisplay - slotItemDoubleClicked(QListViewItem*) + slotItemDoubleClicked(TQListViewItem*) - - slotContextMenuRequested(KListView*,QListViewItem*, const QPoint&) - slotItemDoubleClicked(QListViewItem*) - - + + slotContextMenuRequested(KListView*,TQListViewItem*, const QPoint&) + slotItemDoubleClicked(TQListViewItem*) + + klistview.h diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp index 36381e4..4a79b6e 100644 --- a/src/svnfrontend/blamedisplay_impl.cpp +++ b/src/svnfrontend/blamedisplay_impl.cpp @@ -37,16 +37,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define COL_LINENR 0 #define COL_REV 1 @@ -66,31 +66,31 @@ public: void localeChanged() { if (!codec_searched) { - cc = QTextCodec::codecForName(Kdesvnsettings::locale_for_blame()); + cc = TQTextCodec::codecForName(Kdesvnsettings::locale_for_blame()); codec_searched = true; } if (cc) { m_tLine=cc->toUnicode(line().data(),line().size()); m_tAuthor=cc->toUnicode(author().data(),author().size()); } else { - m_tLine=QString::FROMUTF8(line().data(),line().size()); - m_tAuthor=QString::FROMUTF8(author().data(),author().size()); + m_tLine=TQString::FROMUTF8(line().data(),line().size()); + m_tAuthor=TQString::FROMUTF8(author().data(),author().size()); } } - const QString& tAuthor()const{return m_tAuthor;} - const QString& tLine()const{return m_tLine;} + const TQString& tAuthor()const{return m_tAuthor;} + const TQString& tLine()const{return m_tLine;} static void reset_codec(){codec_searched = false; cc=0;} protected: - QString m_tAuthor,m_tLine; + TQString m_tAuthor,m_tLine; static bool codec_searched; - static QTextCodec * cc; + static TQTextCodec * cc; }; -QTextCodec* LocalizedAnnotatedLine::cc = 0; +TQTextCodec* LocalizedAnnotatedLine::cc = 0; bool LocalizedAnnotatedLine::codec_searched = false; class BlameDisplayItem:public KListViewItem @@ -99,11 +99,11 @@ public: BlameDisplayItem(KListView*,const svn::AnnotateLine&,bool,BlameDisplay_impl*); BlameDisplayItem(KListView*,BlameDisplayItem*,const svn::AnnotateLine&,bool,BlameDisplay_impl*); virtual ~BlameDisplayItem(){} - virtual int compare(QListViewItem *i, int col, bool ascending)const; - virtual void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment); + virtual int compare(TQListViewItem *i, int col, bool ascending)const; + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); virtual int rtti()const{return 1000;} - virtual int width( const QFontMetrics & fm, const QListView * lv, int c ) const; + virtual int width( const TQFontMetrics & fm, const TQListView * lv, int c ) const; apr_int64_t lineNumber(){return m_Content.lineNumber();} svn_revnum_t rev(){return m_Content.revision();} @@ -114,9 +114,9 @@ public: if (m_disp){ setText(COL_AUT,m_Content.tAuthor()); } - QString _line = m_Content.tLine(); - _line.replace("\t"," "); - setText(COL_LINE,QString("%1").arg(_line)); + TQString _line = m_Content.tLine(); + _line.tqreplace("\t"," "); + setText(COL_LINE,TQString("%1").tqarg(_line)); } protected: @@ -142,10 +142,10 @@ BlameDisplayItem::BlameDisplayItem(KListView*lv,BlameDisplayItem*it,const svn::A #define BORDER 4 -int BlameDisplayItem::width (const QFontMetrics & fm, const QListView * lv, int c ) const +int BlameDisplayItem::width (const TQFontMetrics & fm, const TQListView * lv, int c ) const { if (c == COL_LINE) { - return KListViewItem::width(QFontMetrics(KGlobalSettings::fixedFont()),lv,c)+2*BORDER; + return KListViewItem::width(TQFontMetrics(KGlobalSettings::fixedFont()),lv,c)+2*BORDER; } return KListViewItem::width(fm,lv,c)+2*BORDER; } @@ -153,20 +153,20 @@ int BlameDisplayItem::width (const QFontMetrics & fm, const QListView * lv, int void BlameDisplayItem::display() { if (m_disp){ - setText(COL_REV,QString("%1").arg(m_Content.revision())); + setText(COL_REV,TQString("%1").tqarg(m_Content.revision())); setText(COL_AUT,m_Content.tAuthor()); if (m_Content.date().isValid()) { setText(COL_DATE,KGlobal::locale()->formatDateTime(m_Content.date())); } } - setText(COL_LINENR,QString("%1").arg(m_Content.lineNumber()+1)); - QString _line = m_Content.tLine(); - _line.replace("\t"," "); - setText(COL_LINE,QString("%1").arg(_line)); + setText(COL_LINENR,TQString("%1").tqarg(m_Content.lineNumber()+1)); + TQString _line = m_Content.tLine(); + _line.tqreplace("\t"," "); + setText(COL_LINE,TQString("%1").tqarg(_line)); } -int BlameDisplayItem::compare(QListViewItem *item, int col, bool ascending)const +int BlameDisplayItem::compare(TQListViewItem *item, int col, bool ascending)const { Q_UNUSED(ascending); BlameDisplayItem* k = static_cast(item); @@ -182,19 +182,19 @@ int BlameDisplayItem::compare(QListViewItem *item, int col, bool ascending)const return k->m_Content.lineNumber()-m_Content.lineNumber(); } -void BlameDisplayItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) +void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { - if (alignment & (AlignTop || AlignBottom) == 0) - alignment |= AlignVCenter; + if (tqalignment & (AlignTop || AlignBottom) == 0) + tqalignment |= AlignVCenter; /* don't copy string */ - const QString & str = text(column);; + const TQString & str = text(column);; if (column == COL_LINE) { p->setFont(KGlobalSettings::fixedFont()); } - QColorGroup _cg = cg; - QColor _bgColor; + TQColorGroup _cg = cg; + TQColor _bgColor; if (column==COL_LINENR || isSelected()) { _bgColor = KGlobalSettings::highlightColor(); p->setPen(KGlobalSettings::highlightedTextColor()); @@ -202,7 +202,7 @@ void BlameDisplayItem::paintCell(QPainter *p, const QColorGroup &cg, int column, if (Kdesvnsettings::self()->colored_blame()) { _bgColor = cb->rev2color(m_Content.revision()); } else { - _bgColor = listView()->viewport()->colorGroup().base(); + _bgColor = listView()->viewport()->tqcolorGroup().base(); } } @@ -213,7 +213,7 @@ void BlameDisplayItem::paintCell(QPainter *p, const QColorGroup &cg, int column, if (str.isEmpty()) return; - p->drawText(BORDER, 0, width - 2*BORDER, height(), alignment, str); + p->drawText(BORDER, 0, width - 2*BORDER, height(), tqalignment, str); } class BlameDisplayData @@ -230,31 +230,31 @@ class BlameDisplayData } ~BlameDisplayData(){} svn_revnum_t max,min; - QMap m_shadingMap; - QMap m_logCache; + TQMap m_shadingMap; + TQMap m_logCache; - QColor m_lastCalcColor; + TQColor m_lastCalcColor; unsigned int rev_count; bool up; SimpleLogCb*m_cb; - QString m_File; + TQString m_File; KDialogBase*m_dlg; - QString reposRoot; + TQString reposRoot; }; -BlameDisplay_impl::BlameDisplay_impl(QWidget*parent,const char*name) - : BlameDisplay(parent,name) +BlameDisplay_impl::BlameDisplay_impl(TQWidget*tqparent,const char*name) + : BlameDisplay(tqparent,name) { m_Data = new BlameDisplayData(); - connect(m_BlameList,SIGNAL(selectionChanged()),this,SLOT(slotSelectionChanged())); + connect(m_BlameList,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotSelectionChanged())); } -BlameDisplay_impl::BlameDisplay_impl(const QString&what,const svn::AnnotatedFile&blame,QWidget*parent,const char*name) - : BlameDisplay(parent,name) +BlameDisplay_impl::BlameDisplay_impl(const TQString&what,const svn::AnnotatedFile&blame,TQWidget*tqparent,const char*name) + : BlameDisplay(tqparent,name) { m_Data = new BlameDisplayData(); - connect(m_BlameList,SIGNAL(selectionChanged()),this,SLOT(slotSelectionChanged())); + connect(m_BlameList,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotSelectionChanged())); setContent(what,blame); } @@ -263,21 +263,21 @@ void BlameDisplay_impl::setCb(SimpleLogCb*_cb) m_Data->m_cb = _cb; } -void BlameDisplay_impl::setContent(const QString&what,const svn::AnnotatedFile&blame) +void BlameDisplay_impl::setContent(const TQString&what,const svn::AnnotatedFile&blame) { m_Data->m_File = what; m_SearchWidget = new KListViewSearchLineWidget(m_BlameList,this); EncodingSelector_impl*m_Ls = new EncodingSelector_impl(Kdesvnsettings::locale_for_blame(),this); - connect(m_Ls,SIGNAL(TextCodecChanged(const QString&)), - this,SLOT(slotTextCodecChanged(const QString&))); + connect(m_Ls,TQT_SIGNAL(TextCodecChanged(const TQString&)), + this,TQT_SLOT(slotTextCodecChanged(const TQString&))); BlameDisplayLayout->remove(m_BlameList); BlameDisplayLayout->addWidget(m_Ls); BlameDisplayLayout->addWidget(m_SearchWidget); BlameDisplayLayout->addWidget(m_BlameList); - m_BlameList->setColumnAlignment(COL_REV,Qt::AlignRight); - m_BlameList->setColumnAlignment(COL_LINENR,Qt::AlignRight); + m_BlameList->setColumnAlignment(COL_REV,TQt::AlignRight); + m_BlameList->setColumnAlignment(COL_LINENR,TQt::AlignRight); m_BlameList->clear(); if (m_Data->m_dlg) { @@ -296,18 +296,18 @@ void BlameDisplay_impl::setContent(const QString&what,const svn::AnnotatedFile&b if (disp) { lastRev = (*bit).revision(); } - if (m_Data->m_shadingMap.find((*bit).revision())==m_Data->m_shadingMap.end()) { - m_Data->m_shadingMap[(*bit).revision()]=QColor(); + if (m_Data->m_shadingMap.tqfind((*bit).revision())==m_Data->m_shadingMap.end()) { + m_Data->m_shadingMap[(*bit).revision()]=TQColor(); } } if (Kdesvnsettings::self()->colored_blame()) { - QColor a(160,160,160); + TQColor a(160,160,160); int offset = 10; int r=0; int g=0;int b=0; uint colinc=0; for (svn_revnum_t i = m_Data->min; i<= m_Data->max;++i) { - if (m_Data->m_shadingMap.find(i)==m_Data->m_shadingMap.end()) { + if (m_Data->m_shadingMap.tqfind(i)==m_Data->m_shadingMap.end()) { continue; } a.setRgb(a.red()+offset,a.green()+offset,a.blue()+offset); @@ -338,13 +338,13 @@ void BlameDisplay_impl::setContent(const QString&what,const svn::AnnotatedFile&b } } -const QColor BlameDisplay_impl::rev2color(svn_revnum_t r )const +const TQColor BlameDisplay_impl::rev2color(svn_revnum_t r )const { - if (m_Data->m_shadingMap.find(r)!=m_Data->m_shadingMap.end() && m_Data->m_shadingMap[r].isValid()) + if (m_Data->m_shadingMap.tqfind(r)!=m_Data->m_shadingMap.end() && m_Data->m_shadingMap[r].isValid()) { return m_Data->m_shadingMap[r]; } else { - return m_BlameList->viewport()->colorGroup().base(); + return m_BlameList->viewport()->tqcolorGroup().base(); } } @@ -361,7 +361,7 @@ void BlameDisplay_impl::slotGoLine() if (!ok) { return; } - QListViewItem*item = m_BlameList->firstChild(); + TQListViewItem*item = m_BlameList->firstChild(); --line; while (item) { if (item->rtti()==1000) { @@ -376,11 +376,11 @@ void BlameDisplay_impl::slotGoLine() } } -void BlameDisplay_impl::slotContextMenuRequested(KListView*,QListViewItem*item, const QPoint&pos) +void BlameDisplay_impl::slotContextMenuRequested(KListView*,TQListViewItem*item, const TQPoint&pos) { if (item==0||item->rtti()!=1000) return; BlameDisplayItem*bit = static_cast(item); - QPopupMenu popup; + TQPopupMenu popup; popup.insertItem(i18n("Log message for revision"),101); int r = popup.exec(pos); @@ -398,11 +398,11 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit) { if (!bit) return; WidgetBlockStack a(m_BlameList); - QString text; - if (m_Data->m_logCache.find(bit->rev())!=m_Data->m_logCache.end()) { + TQString text; + if (m_Data->m_logCache.tqfind(bit->rev())!=m_Data->m_logCache.end()) { text = m_Data->m_logCache[bit->rev()].message; } else { - CursorStack a(Qt::BusyCursor); + CursorStack a(TQt::BusyCursor); svn::LogEntry t; if (m_Data->m_cb && m_Data->m_cb->getSingleLog(t,bit->rev(),m_Data->m_File,m_Data->max,m_Data->reposRoot)) { m_Data->m_logCache[bit->rev()] = t; @@ -410,13 +410,13 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit) } } KDialogBase* dlg = new KDialogBase( - KApplication::activeModalWidget(), - "simplelog",true,QString(i18n("Logmessage for revision %1").arg(bit->rev())), + TQT_TQWIDGET(KApplication::activeModalWidget()), + "simplelog",true,TQString(i18n("Logmessage for revision %1").tqarg(bit->rev())), KDialogBase::Close); - QWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); KTextBrowser*ptr = new KTextBrowser(Dialog1Layout); ptr->setFont(KGlobalSettings::fixedFont()); - ptr->setWordWrap(QTextEdit::NoWrap); + ptr->setWordWrap(TQTextEdit::NoWrap); ptr->setText(text); dlg->resize(dlg->configDialogSize(*(Kdesvnsettings::self()->config()),"simplelog_display")); dlg->exec(); @@ -425,7 +425,7 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit) void BlameDisplay_impl::slotShowCurrentCommit() { - QListViewItem*item = m_BlameList->selectedItem(); + TQListViewItem*item = m_BlameList->selectedItem(); if (item==0||item->rtti()!=1000) return; BlameDisplayItem*bit = static_cast(item); showCommit(bit); @@ -434,7 +434,7 @@ void BlameDisplay_impl::slotShowCurrentCommit() void BlameDisplay_impl::slotSelectionChanged() { if (!m_Data->m_dlg) return; - QListViewItem*item = m_BlameList->selectedItem(); + TQListViewItem*item = m_BlameList->selectedItem(); if (item==0||item->rtti()!=1000) { m_Data->m_dlg->enableButton(KDialogBase::User2,false); } else { @@ -442,43 +442,43 @@ void BlameDisplay_impl::slotSelectionChanged() } } -void BlameDisplay_impl::displayBlame(SimpleLogCb*_cb,const QString&item,const svn::AnnotatedFile&blame,QWidget*,const char*name) +void BlameDisplay_impl::displayBlame(SimpleLogCb*_cb,const TQString&item,const svn::AnnotatedFile&blame,TQWidget*,const char*name) { int buttons = KDialogBase::Close|KDialogBase::User1|KDialogBase::User2; KDialogBase * dlg = new KDialogBase( - KApplication::activeModalWidget(), - name,true,QString(i18n("Blame %1")).arg(item),buttons,KDialogBase::Close,false, + TQT_TQWIDGET(KApplication::activeModalWidget()), + name,true,TQString(i18n("Blame %1")).tqarg(item),buttons,KDialogBase::Close,false, KGuiItem(i18n("Goto line")),KGuiItem(i18n("Log message for revision"),"kdesvnlog")); - QWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); BlameDisplay_impl*ptr = new BlameDisplay_impl(Dialog1Layout); dlg->resize(dlg->configDialogSize(*(Kdesvnsettings::self()->config()),"blame_dlg")); ptr->setContent(item,blame); ptr->setCb(_cb); ptr->m_Data->m_dlg = dlg; dlg->enableButton(KDialogBase::User2,false); - connect(dlg,SIGNAL(user1Clicked()),ptr,SLOT(slotGoLine())); - connect(dlg,SIGNAL(user2Clicked()),ptr,SLOT(slotShowCurrentCommit())); + connect(dlg,TQT_SIGNAL(user1Clicked()),ptr,TQT_SLOT(slotGoLine())); + connect(dlg,TQT_SIGNAL(user2Clicked()),ptr,TQT_SLOT(slotShowCurrentCommit())); Dialog1Layout->adjustSize(); dlg->exec(); dlg->saveDialogSize(*(Kdesvnsettings::self()->config()),"blame_dlg",false); } -void BlameDisplay_impl::slotItemDoubleClicked(QListViewItem*item) +void BlameDisplay_impl::slotItemDoubleClicked(TQListViewItem*item) { if (item==0||item->rtti()!=1000) return; BlameDisplayItem*bit = static_cast(item); showCommit(bit); } -void BlameDisplay_impl::slotTextCodecChanged(const QString&what) +void BlameDisplay_impl::slotTextCodecChanged(const TQString&what) { if (Kdesvnsettings::locale_for_blame()!=what) { Kdesvnsettings::setLocale_for_blame(what); Kdesvnsettings::self()->writeConfig(); LocalizedAnnotatedLine::reset_codec(); - QListViewItemIterator it(m_BlameList); + TQListViewItemIterator it(m_BlameList); while ( it.current() ) { BlameDisplayItem*_it = static_cast(it.current()); _it->localeChanged(); diff --git a/src/svnfrontend/blamedisplay_impl.h b/src/svnfrontend/blamedisplay_impl.h index 013e05a..a07f035 100644 --- a/src/svnfrontend/blamedisplay_impl.h +++ b/src/svnfrontend/blamedisplay_impl.h @@ -31,26 +31,27 @@ class KListViewSearchLineWidget; class BlameDisplay_impl:public BlameDisplay { Q_OBJECT + TQ_OBJECT public: - BlameDisplay_impl(const QString&,const svn::AnnotatedFile&,QWidget*parent=0,const char*name=0); - BlameDisplay_impl(QWidget*parent=0,const char*name=0); + BlameDisplay_impl(const TQString&,const svn::AnnotatedFile&,TQWidget*tqparent=0,const char*name=0); + BlameDisplay_impl(TQWidget*tqparent=0,const char*name=0); virtual ~BlameDisplay_impl(); - virtual void setContent(const QString&,const svn::AnnotatedFile&); + virtual void setContent(const TQString&,const svn::AnnotatedFile&); virtual void setCb(SimpleLogCb*); - const QColor rev2color(svn_revnum_t)const; + const TQColor rev2color(svn_revnum_t)const; - static void displayBlame(SimpleLogCb*,const QString&,const svn::AnnotatedFile&,QWidget*parent=0,const char*name=0); + static void displayBlame(SimpleLogCb*,const TQString&,const svn::AnnotatedFile&,TQWidget*tqparent=0,const char*name=0); public slots: virtual void slotGoLine(); virtual void slotShowCurrentCommit(); protected slots: - virtual void slotContextMenuRequested(KListView*,QListViewItem*, const QPoint&); + virtual void slotContextMenuRequested(KListView*,TQListViewItem*, const TQPoint&); virtual void slotSelectionChanged(); - virtual void slotTextCodecChanged(const QString&); + virtual void slotTextCodecChanged(const TQString&); protected: virtual void showCommit(BlameDisplayItem*); @@ -59,7 +60,7 @@ protected: private: BlameDisplayData*m_Data; protected slots: - virtual void slotItemDoubleClicked(QListViewItem*); + virtual void slotItemDoubleClicked(TQListViewItem*); }; #endif diff --git a/src/svnfrontend/cacheentry.h b/src/svnfrontend/cacheentry.h index 2ab422b..db4cd6d 100644 --- a/src/svnfrontend/cacheentry.h +++ b/src/svnfrontend/cacheentry.h @@ -24,11 +24,11 @@ #include "src/svnqt/shared_pointer.hpp" #include "src/svnqt/status.hpp" -// std::map 'cause QMap isn't usable +// std::map 'cause TQMap isn't usable #include #include -#include -#include +#include +#include namespace helpers { @@ -40,31 +40,31 @@ namespace helpers { template class cacheEntry { public: typedef cacheEntry cache_type; - typedef typename std::map cache_map_type; + typedef typename std::map cache_map_type; typedef typename cache_map_type::const_iterator citer; typedef typename cache_map_type::iterator iter; protected: - QString m_key; + TQString m_key; bool m_isValid; C m_content; cache_map_type m_subMap; public: cacheEntry(); - cacheEntry(const QString&key); + cacheEntry(const TQString&key); cacheEntry(const cacheEntry&other); virtual ~cacheEntry(){}; - virtual bool find(QStringList&,QLIST&)const; + virtual bool find(TQStringList&,TQLIST&)const; //! Checks if cache contains a specific item /*! * the keylist will manipulated - so copy-operations aren't needed. * \param what Stringlist containing the components to search for * \return true if found (may or may not valid!) otherwise false */ - virtual bool find(QStringList&what)const; + virtual bool find(TQStringList&what)const; //! Checks if cache contains a specific valid item /*! * if yes, the content will stored in st @@ -72,19 +72,19 @@ public: * \param st target status to store content if found * \return true if found */ - virtual bool findSingleValid(QStringList&what,C&st)const; + virtual bool findSingleValid(TQStringList&what,C&st)const; //! Checks if cache contains a specific valid item /*! - * in difference to virtual bool find(QStringList&,svn::StatusEntries&)const no copy operations + * in difference to virtual bool find(TQStringList&,svn::StatusEntries&)const no copy operations * are made inside so it works much faster for simple find. * \param what the keylist to search for * \param check_valid_subs if true, return true if a subitem is valid even the item isn't valid * \return true if found */ - virtual bool findSingleValid(QStringList&what,bool check_valid_subs)const; - template void listsubs_if(QStringList&_what,T&oper)const; + virtual bool findSingleValid(TQStringList&what,bool check_valid_subs)const; + template void listsubs_if(TQStringList&_what,T&oper)const; - virtual void appendValidSub(QLIST&)const; + virtual void appendValidSub(TQLIST&)const; virtual bool isValid()const { return m_isValid; @@ -93,9 +93,9 @@ public: { return m_content; } - virtual bool deleteKey(QStringList&,bool exact); - virtual void insertKey(QStringList&,const C&); - virtual void setValidContent(const QString&key,const C&st) + virtual bool deleteKey(TQStringList&,bool exact); + virtual void insertKey(TQStringList&,const C&); + virtual void setValidContent(const TQString&key,const C&st) { kdDebug()<<"Insert for "<::const_iterator it; + std::map::const_iterator it; for (it=m_subMap.begin();it!=m_subMap.end();++it) { std::cout<first.latin1() << " (" << it->second.m_key.latin1() << ")"<second.dump_tree(level+1); @@ -133,7 +133,7 @@ template inline cacheEntry::cacheEntry() { } -template inline cacheEntry::cacheEntry(const QString&key) +template inline cacheEntry::cacheEntry(const TQString&key) : m_key(key),m_isValid(false),m_content() { } @@ -153,7 +153,7 @@ template inline cacheEntry& cacheEntry::operator=(const cacheEntr return *this; } -template inline bool cacheEntry::find(QStringList&what,QLIST&t)const +template inline bool cacheEntry::find(TQStringList&what,TQLIST&t)const { if (what.count()==0) { return false; @@ -185,7 +185,7 @@ template inline bool cacheEntry::find(QStringList&what,QLIST&t)c return it->second.find(what,t); } -template inline bool cacheEntry::find(QStringList&what)const +template inline bool cacheEntry::find(TQStringList&what)const { if (what.count()==0) { return false; @@ -201,12 +201,12 @@ template inline bool cacheEntry::find(QStringList&what)const return it->second.find(what); } -template inline bool cacheEntry::findSingleValid(QStringList&what,C&t)const +template inline bool cacheEntry::findSingleValid(TQStringList&what,C&t)const { if (what.count()==0) { return false; } - //kdDebug()<<"cacheEntry::findSingleValid(QStringList&what,C&t)"<< what << endl; + //kdDebug()<<"cacheEntry::findSingleValid(TQStringList&what,C&t)"<< what << endl; citer it; it = m_subMap.find(what[0]); if (it==m_subMap.end()) { @@ -223,12 +223,12 @@ template inline bool cacheEntry::findSingleValid(QStringList&what,C& return it->second.findSingleValid(what,t); } -template inline bool cacheEntry::findSingleValid(QStringList&what,bool check_valid_subs)const +template inline bool cacheEntry::findSingleValid(TQStringList&what,bool check_valid_subs)const { if (what.count()==0) { return false; } - // kdDebug()<<"cacheEntry::findSingleValid(QStringList&what,svn::Status&t)"<< what << endl; + // kdDebug()<<"cacheEntry::findSingleValid(TQStringList&what,svn::tqStatus&t)"<< what << endl; citer it = m_subMap.find(what[0]); if (it==m_subMap.end()) { return false; @@ -240,7 +240,7 @@ template inline bool cacheEntry::findSingleValid(QStringList&what,bo return it->second.findSingleValid(what,check_valid_subs); } -template inline void cacheEntry::appendValidSub(QLIST&t)const +template inline void cacheEntry::appendValidSub(TQLIST&t)const { citer it; for (it=m_subMap.begin();it!=m_subMap.end();++it) { @@ -254,7 +254,7 @@ template inline void cacheEntry::appendValidSub(QLIST&t)const } } -template inline bool cacheEntry::deleteKey(QStringList&what,bool exact) +template inline bool cacheEntry::deleteKey(TQStringList&what,bool exact) { if (what.count()==0) { return true; @@ -295,13 +295,13 @@ template inline bool cacheEntry::hasValidSubs()const return false; } -template inline void cacheEntry::insertKey(QStringList&what,const C&st) +template inline void cacheEntry::insertKey(TQStringList&what,const C&st) { if (what.count()==0) { return; } //kdDebug()<<"inserting "< inline void cacheEntry::insertKey(QStringList&what,const C& m_subMap[m].insertKey(what,st); } -template template inline void cacheEntry::listsubs_if(QStringList&what,T&oper)const +template template inline void cacheEntry::listsubs_if(TQStringList&what,T&oper)const { if (what.count()==0) { /* we are the one to get the list for*/ @@ -338,7 +338,7 @@ template class itemCache { public: typedef cacheEntry cache_type; - typedef typename std::map cache_map_type; + typedef typename std::map cache_map_type; typedef typename cache_map_type::const_iterator citer; typedef typename cache_map_type::iterator iter; @@ -349,7 +349,7 @@ public: itemCache():m_contentMap(){} virtual ~itemCache(){}; - void setContent(const QLIST&dlist); + void setContent(const TQLIST&dlist); void clear(){m_contentMap.clear();} //! Checks if cache contains a specific item /*! @@ -357,25 +357,25 @@ public: * \param what Stringlist containing the components to search for * \return true if found (may or may not valid!) otherwise false */ - virtual bool find(const QString&what)const; - virtual bool find(const QString&,QLIST&)const; + virtual bool find(const TQString&what)const; + virtual bool find(const TQString&,TQLIST&)const; - virtual void deleteKey(const QString&what,bool exact); - virtual void insertKey(const C&,const QString&path); - virtual bool findSingleValid(const QString&what,C&)const; - virtual bool findSingleValid(const QString&what,bool check_valid_subs)const; + virtual void deleteKey(const TQString&what,bool exact); + virtual void insertKey(const C&,const TQString&path); + virtual bool findSingleValid(const TQString&what,C&)const; + virtual bool findSingleValid(const TQString&what,bool check_valid_subs)const; - templatevoid listsubs_if(const QString&what,T&oper)const; + templatevoid listsubs_if(const TQString&what,T&oper)const; void dump_tree(); }; -template inline void itemCache::setContent(const QLIST&dlist) +template inline void itemCache::setContent(const TQLIST&dlist) { m_contentMap.clear(); citer it; for (it=dlist.begin();it!=dlist.end();++it) { - QStringList _keys = QStringList::split("/",(*it).path()); + TQStringList _keys = TQStringList::split("/",(*it).path()); if (_keys.count()==0) { continue; } @@ -389,10 +389,10 @@ template inline void itemCache::setContent(const QLIST&dlist) } } -template inline void itemCache::insertKey(const C&st,const QString&path) +template inline void itemCache::insertKey(const C&st,const TQString&path) { // kdDebug()<<"Inserting "< inline void itemCache::insertKey(const C&st,const QString&p if (_keys.count()==1) { m_contentMap[_keys[0]].setValidContent(_keys[0],st); } else { - QString m = _keys[0]; + TQString m = _keys[0]; _keys.erase(_keys.begin()); m_contentMap[m].insertKey(_keys,st); } } -template inline bool itemCache::find(const QString&what)const +template inline bool itemCache::find(const TQString&what)const { if (m_contentMap.size()==0) { return false; } - QStringList _keys = QStringList::split("/",what); + TQStringList _keys = TQStringList::split("/",what); if (_keys.count()==0) { return false; } @@ -430,12 +430,12 @@ template inline bool itemCache::find(const QString&what)const return it->second.find(_keys); } -template inline bool itemCache::find(const QString&_what,QLIST&dlist)const +template inline bool itemCache::find(const TQString&_what,TQLIST&dlist)const { if (m_contentMap.size()==0) { return false; } - QStringList what = QStringList::split("/",_what); + TQStringList what = TQStringList::split("/",_what); if (what.count()==0) { return false; } @@ -444,16 +444,16 @@ template inline bool itemCache::find(const QString&_what,QLIST&dl return false; } what.erase(what.begin()); - // kdDebug()<<"itemCache::find(const QString&_what,svn::StatusEntries&dlist) "<second.find(what,dlist); } -template inline void itemCache::deleteKey(const QString&_what,bool exact) +template inline void itemCache::deleteKey(const TQString&_what,bool exact) { if (m_contentMap.size()==0) { return; } - QStringList what = QStringList::split("/",_what); + TQStringList what = TQStringList::split("/",_what); if (what.count()==0) { return; } @@ -490,12 +490,12 @@ template inline void itemCache::dump_tree() } } -template inline bool itemCache::findSingleValid(const QString&_what,C&st)const +template inline bool itemCache::findSingleValid(const TQString&_what,C&st)const { if (m_contentMap.size()==0) { return false; } - QStringList what = QStringList::split("/",_what); + TQStringList what = TQStringList::split("/",_what); if (what.count()==0) { return false; } @@ -517,12 +517,12 @@ template inline bool itemCache::findSingleValid(const QString&_what, return it->second.findSingleValid(what,st); } -template inline bool itemCache::findSingleValid(const QString&_what,bool check_valid_subs)const +template inline bool itemCache::findSingleValid(const TQString&_what,bool check_valid_subs)const { if (m_contentMap.size()==0) { return false; } - QStringList what = QStringList::split("/",_what); + TQStringList what = TQStringList::split("/",_what); if (what.count()==0) { return false; } @@ -537,12 +537,12 @@ template inline bool itemCache::findSingleValid(const QString&_what, return it->second.findSingleValid(what,check_valid_subs); } -template template inline void itemCache::listsubs_if(const QString&_what,T&oper)const +template template inline void itemCache::listsubs_if(const TQString&_what,T&oper)const { if (m_contentMap.size()==0) { return; } - QStringList what = QStringList::split("/",_what); + TQStringList what = TQStringList::split("/",_what); if (what.count()==0) { return; } @@ -567,9 +567,9 @@ class ValidRemoteOnly svn::StatusEntries m_List; public: ValidRemoteOnly():m_List(){} - void operator()(const std::pair&_data) + void operator()(const std::pair&_data) { - if(_data.second.isValid() && _data.second.content()->validReposStatus()&&!_data.second.content()->validLocalStatus()) { + if(_data.second.isValid() && _data.second.content()->validRepostqStatus()&&!_data.second.content()->validLocaltqStatus()) { m_List.push_back(_data.second.content()); } } diff --git a/src/svnfrontend/ccontextlistener.cpp b/src/svnfrontend/ccontextlistener.cpp index a331db4..ddcdaa4 100644 --- a/src/svnfrontend/ccontextlistener.cpp +++ b/src/svnfrontend/ccontextlistener.cpp @@ -31,9 +31,9 @@ #include #include -#include -#include -#include +#include +#include +#include class CContextListenerData { @@ -43,7 +43,7 @@ public: // data bool m_cancelMe; - QMutex m_CancelMutex; + TQMutex m_CancelMutex; bool noDialogs; }; @@ -59,7 +59,7 @@ CContextListenerData::~CContextListenerData() const int CContextListener::smax_actionstring=svn_wc_notify_failed_unlock+1; -const QString CContextListener::action_strings[]={ +const TQString CContextListener::action_strings[]={ I18N_NOOP("Add to revision control"), I18N_NOOP("Copy"), I18N_NOOP("Delete"), @@ -73,48 +73,48 @@ const QString CContextListener::action_strings[]={ I18N_NOOP("Update"), //svn_wc_notify_update_update I18N_NOOP("Update complete"), I18N_NOOP("Update external module"), - QString::null, // status completed - will not send is just noisy - I18N_NOOP("Status on external"), //svn_wc_notify_status_external + TQString(), // status completed - will not send is just noisy + I18N_NOOP("tqStatus on external"), //svn_wc_notify_status_external I18N_NOOP("Commit Modified"), I18N_NOOP("Commit Added"), I18N_NOOP("Commit Deleted"), I18N_NOOP("Commit Replaced"), - QString::null, //tx delta -> making ticks instead - QString::null, //svn_wc_notify_blame_revision - using ticks + TQString(), //tx delta -> making ticks instead + TQString(), //svn_wc_notify_blame_revision - using ticks I18N_NOOP("Locking"), I18N_NOOP("Unlocked"), I18N_NOOP("Lock failed"), I18N_NOOP("Unlock failed") }; -const QString CContextListener::notify_state_strings[]={ - QString::null, // = 0 - QString::null, +const TQString CContextListener::notify_state_strings[]={ + TQString(), // = 0 + TQString(), I18N_NOOP("unchanged"), I18N_NOOP("item wasn't present"), I18N_NOOP("unversioned item obstructed work"), // I18N_NOOP("Pristine state was modified."), // should send a signal with path instead of message? - QString::null, + TQString(), I18N_NOOP("Modified state had mods merged in."), I18N_NOOP("Modified state got conflicting mods.") }; -QString CContextListener::NotifyAction(svn_wc_notify_action_t action) +TQString CContextListener::NotifyAction(svn_wc_notify_action_t action) { if (action>=smax_actionstring||action<0) { - return QString::null; + return TQString(); } - return action_strings[action].isEmpty()?QString::null:i18n(action_strings[action]); + return action_strings[action].isEmpty()?TQString():i18n(action_strings[action]); } -QString CContextListener::NotifyState(svn_wc_notify_state_t state) +TQString CContextListener::NotifyState(svn_wc_notify_state_t state) { - if (state > svn_wc_notify_state_conflicted || state<0) return QString::null; - return notify_state_strings[state].isEmpty()?QString::null:i18n(notify_state_strings[state]); + if (state > svn_wc_notify_state_conflicted || state<0) return TQString(); + return notify_state_strings[state].isEmpty()?TQString():i18n(notify_state_strings[state]); } -CContextListener::CContextListener(QObject *parent, const char *name) - : QObject(parent, name), svn::ContextListener(),ref_count() +CContextListener::CContextListener(TQObject *tqparent, const char *name) + : TQObject(tqparent, name), svn::ContextListener(),ref_count() { m_Data = new CContextListenerData(); } @@ -125,13 +125,13 @@ CContextListener::~CContextListener() delete m_Data; } -bool CContextListener::contextGetCachedLogin (const QString & realm,QString & username,QString & password) +bool CContextListener::contextGetCachedLogin (const TQString & realm,TQString & username,TQString & password) { PwStorage::self()->getCachedLogin(realm,username,password); return true; } -bool CContextListener::contextGetSavedLogin (const QString & realm,QString & username,QString & password) +bool CContextListener::contextGetSavedLogin (const TQString & realm,TQString & username,TQString & password) { PwStorage::self()->getLogin(realm,username,password); PwStorage::self()->setCachedLogin(realm,username,password); @@ -140,16 +140,16 @@ bool CContextListener::contextGetSavedLogin (const QString & realm,QString & use } bool CContextListener::contextGetLogin ( - const QString & realm, - QString & username, - QString & password, + const TQString & realm, + TQString & username, + TQString & password, bool & maySave) { maySave = false; emit waitShow(true); emit sendNotify(realm); AuthDialogImpl auth(realm,username); - if (auth.exec()==QDialog::Accepted) { + if (auth.exec()==TQDialog::Accepted) { username=auth.Username(); password=auth.Password(); maySave = (Kdesvnsettings::passwords_in_wallet()?false:auth.maySave()); @@ -166,7 +166,7 @@ bool CContextListener::contextGetLogin ( return false; } -void CContextListener::contextNotify(const QString&aMsg) +void CContextListener::contextNotify(const TQString&aMsg) { if (aMsg.isEmpty()) { emit tickProgress(); @@ -183,12 +183,12 @@ void CContextListener::contextNotify (const char *path, svn_wc_notify_state_t prop_state, svn_revnum_t revision) { - QString msg; - QString aString = NotifyAction(action); + TQString msg; + TQString aString = NotifyAction(action); if (!aString.isEmpty()) { - QTextStream ts(&msg,IO_WriteOnly); - ts << NotifyAction(action) << " " << QString::FROMUTF8(path); + TQTextStream ts(&msg,IO_WriteOnly); + ts << NotifyAction(action) << " " << TQString::FROMUTF8(path); if (revision>-1) { ts << " (Rev "<content_state,action->prop_state,action->revision); // return; // } -// QString aString = NotifyAction(action->action); +// TQString aString = NotifyAction(action->action); } void CContextListener::sendTick() @@ -219,7 +219,7 @@ void CContextListener::sendTick() bool CContextListener::contextCancel() { { - QMutexLocker lock(&(m_Data->m_CancelMutex)); + TQMutexLocker lock(&(m_Data->m_CancelMutex)); if (m_Data->m_cancelMe) { m_Data->m_cancelMe=false; return true; @@ -230,11 +230,11 @@ bool CContextListener::contextCancel() return false; } -bool CContextListener::contextGetLogMessage (QString & msg,const svn::CommitItemList&items) +bool CContextListener::contextGetLogMessage (TQString & msg,const svn::CommitItemList&items) { bool isOk = false; emit waitShow(true); - QString logMessage = Logmsg_impl::getLogmessage(items,&isOk,0,0,0); + TQString logMessage = Logmsg_impl::getLogmessage(items,&isOk,0,0,0); if (isOk) { msg = logMessage; } @@ -265,13 +265,13 @@ svn::ContextListener::SslServerTrustAnswer CContextListener::contextSslServerTru return ACCEPT_PERMANENTLY; } -bool CContextListener::contextSslClientCertPrompt (QString & certFile) +bool CContextListener::contextSslClientCertPrompt (TQString & certFile) { kdDebug()<<"CContextListener::contextSslClientCertPrompt " << certFile << endl; emit waitShow(true); - QString afile = KFileDialog::getOpenFileName(QString::null, - QString::null, + TQString afile = KFileDialog::getOpenFileName(TQString(), + TQString(), 0, i18n("Open a file with a #PKCS12 certificate")); emit waitShow(false); @@ -282,21 +282,21 @@ bool CContextListener::contextSslClientCertPrompt (QString & certFile) return true; } -bool CContextListener::contextLoadSslClientCertPw(QString&password,const QString&realm) +bool CContextListener::contextLoadSslClientCertPw(TQString&password,const TQString&realm) { PwStorage::self()->getCertPw(realm,password); return true; } -bool CContextListener::contextSslClientCertPwPrompt (QString & password, - const QString & realm, bool & maysave) +bool CContextListener::contextSslClientCertPwPrompt (TQString & password, + const TQString & realm, bool & maysave) { maysave = false; emit waitShow(true); - QCString npass; + TQCString npass; int keep = 1; int res = KPasswordDialog::getPassword(npass, - i18n("Enter password for realm %1").arg(realm), + i18n("Enter password for realm %1").tqarg(realm), &keep); emit waitShow(false); if (res!=KPasswordDialog::Accepted) { @@ -312,13 +312,13 @@ bool CContextListener::contextSslClientCertPwPrompt (QString & password, void CContextListener::setCanceled(bool how) { - QMutexLocker lock(&(m_Data->m_CancelMutex)); + TQMutexLocker lock(&(m_Data->m_CancelMutex)); m_Data->m_cancelMe = how; } -QStringList CContextListener::failure2Strings(apr_uint32_t acceptedFailures) +TQStringList CContextListener::failure2Strings(apr_uint32_t acceptedFailures) { - QStringList res; + TQStringList res; if (acceptedFailures&SVN_AUTH_SSL_UNKNOWNCA) { res << i18n("The certificate is not issued by a trusted authority. Use the fingerprint to validate the certificate manually!"); } @@ -337,7 +337,7 @@ QStringList CContextListener::failure2Strings(apr_uint32_t acceptedFailures) return res; } -QString CContextListener::translate(const QString&what) +TQString CContextListener::translate(const TQString&what) { return i18n(what); } diff --git a/src/svnfrontend/ccontextlistener.h b/src/svnfrontend/ccontextlistener.h index 216243b..3bb48bd 100644 --- a/src/svnfrontend/ccontextlistener.h +++ b/src/svnfrontend/ccontextlistener.h @@ -23,28 +23,29 @@ #include "src/svnqt/context_listener.hpp" #include "src/svnqt/smart_pointer.hpp" -#include -#include +#include +#include class CContextListenerData; /** @author Rajko Albrecht */ -class CContextListener : public QObject, public svn::ContextListener,public svn::ref_count +class CContextListener : public TQObject, public svn::ContextListener,public svn::ref_count { Q_OBJECT + TQ_OBJECT public: - CContextListener(QObject *parent = 0, const char *name = 0); + CContextListener(TQObject *tqparent = 0, const char *name = 0); virtual ~CContextListener(); /* context-listener methods */ - virtual bool contextGetLogin (const QString & realm, - QString & username, - QString & password, + virtual bool contextGetLogin (const TQString & realm, + TQString & username, + TQString & password, bool & maySave); - virtual bool contextGetSavedLogin (const QString & realm,QString & username,QString & password); - virtual bool contextGetCachedLogin(const QString & realm,QString & username,QString & password); + virtual bool contextGetSavedLogin (const TQString & realm,TQString & username,TQString & password); + virtual bool contextGetCachedLogin(const TQString & realm,TQString & username,TQString & password); virtual void contextNotify (const char *path, @@ -54,7 +55,7 @@ public: svn_wc_notify_state_t content_state, svn_wc_notify_state_t prop_state, svn_revnum_t revision); - virtual void contextNotify(const QString&aMsg); + virtual void contextNotify(const TQString&aMsg); virtual void sendTick(); virtual void contextNotify (const svn_wc_notify_t *action); @@ -62,34 +63,34 @@ public: /*! * Get logmessage for checkin and so on... */ - virtual bool contextGetLogMessage (QString & msg,const svn::CommitItemList&); + virtual bool contextGetLogMessage (TQString & msg,const svn::CommitItemList&); virtual SslServerTrustAnswer contextSslServerTrustPrompt (const SslServerTrustData & data, apr_uint32_t & acceptedFailures); - virtual bool contextSslClientCertPrompt (QString & certFile); - virtual bool contextSslClientCertPwPrompt (QString & password, - const QString & realm, bool & maySave); - virtual bool contextLoadSslClientCertPw(QString&password,const QString&realm); - virtual QString translate(const QString&what); + virtual bool contextSslClientCertPrompt (TQString & certFile); + virtual bool contextSslClientCertPwPrompt (TQString & password, + const TQString & realm, bool & maySave); + virtual bool contextLoadSslClientCertPw(TQString&password,const TQString&realm); + virtual TQString translate(const TQString&what); - static QString NotifyAction(svn_wc_notify_action_t action); - static QString NotifyState(svn_wc_notify_state_t); + static TQString NotifyAction(svn_wc_notify_action_t action); + static TQString NotifyState(svn_wc_notify_state_t); - static QStringList failure2Strings(apr_uint32_t acceptedFailures); + static TQStringList failure2Strings(apr_uint32_t acceptedFailures); virtual void contextProgress(long long int current, long long int max); public slots: virtual void setCanceled(bool); signals: - void sendNotify(const QString&); + void sendNotify(const TQString&); void tickProgress(); void waitShow(bool); void netProgress(long long int, long long int); protected: static const int smax_actionstring; - static const QString action_strings[]; - static const QString notify_state_strings[]; + static const TQString action_strings[]; + static const TQString notify_state_strings[]; CContextListenerData*m_Data; }; diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp index 86638de..daeab29 100644 --- a/src/svnfrontend/commandexec.cpp +++ b/src/svnfrontend/commandexec.cpp @@ -39,10 +39,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include class pCPart { @@ -50,8 +50,8 @@ public: pCPart(); ~pCPart(); - QString cmd; - QStringList url; + TQString cmd; + TQStringList url; bool ask_revision; bool rev_set; bool outfile_set; @@ -63,12 +63,12 @@ public: svn::Revision start,end; // for output - QFile toStdout,toStderr; - QString outfile; - QTextStream Stdout,Stderr; + TQFile toStdout,toStderr; + TQString outfile; + TQTextStream Stdout,Stderr; DummyDisplay * disp; - QMap extraRevisions; - QMap baseUrls; + TQMap extraRevisions; + TQMap baseUrls; }; pCPart::pCPart() @@ -79,8 +79,8 @@ pCPart::pCPart() end = svn::Revision::UNDEFINED; toStdout.open(IO_WriteOnly, stdout); toStderr.open(IO_WriteOnly, stderr); - Stdout.setDevice(&toStdout); - Stderr.setDevice(&toStderr); + Stdout.setDevice(TQT_TQIODEVICE(&toStdout)); + Stderr.setDevice(TQT_TQIODEVICE(&toStderr)); disp = new DummyDisplay(); m_SvnWrapper = new SvnActions(disp,0,true); } @@ -91,16 +91,16 @@ pCPart::~pCPart() delete disp; } -CommandExec::CommandExec(QObject*parent, const char *name,KCmdLineArgs *args) - : QObject(parent,name) +CommandExec::CommandExec(TQObject*tqparent, const char *name,KCmdLineArgs *args) + : TQObject(tqparent,name) { m_pCPart = new pCPart; m_pCPart->args = args; SshAgent ag; ag.querySshAgent(); - connect(m_pCPart->m_SvnWrapper,SIGNAL(clientException(const QString&)),this,SLOT(clientException(const QString&))); - connect(m_pCPart->m_SvnWrapper,SIGNAL(sendNotify(const QString&)),this,SLOT(slotNotifyMessage(const QString&))); + connect(m_pCPart->m_SvnWrapper,TQT_SIGNAL(clientException(const TQString&)),this,TQT_SLOT(clientException(const TQString&))); + connect(m_pCPart->m_SvnWrapper,TQT_SIGNAL(sendNotify(const TQString&)),this,TQT_SLOT(slotNotifyMessage(const TQString&))); m_pCPart->m_SvnWrapper->reInitClient(); } @@ -128,111 +128,111 @@ int CommandExec::exec() m_pCPart->cmd=m_pCPart->args->arg(1); m_pCPart->cmd=m_pCPart->cmd.lower(); } - QString slotCmd; - if (!QString::compare(m_pCPart->cmd,"log")) { - slotCmd=SLOT(slotCmd_log()); - } else if (!QString::compare(m_pCPart->cmd,"cat")) { - slotCmd=SLOT(slotCmd_cat()); + TQString slotCmd; + if (!TQString::compare(m_pCPart->cmd,"log")) { + slotCmd=TQT_SLOT(slotCmd_log()); + } else if (!TQString::compare(m_pCPart->cmd,"cat")) { + slotCmd=TQT_SLOT(slotCmd_cat()); m_pCPart->single_revision=true; - } else if (!QString::compare(m_pCPart->cmd,"get")) { - slotCmd=SLOT(slotCmd_get()); + } else if (!TQString::compare(m_pCPart->cmd,"get")) { + slotCmd=TQT_SLOT(slotCmd_get()); m_pCPart->single_revision=true; - } else if (!QString::compare(m_pCPart->cmd,"help")) { - slotCmd=SLOT(slotCmd_help()); - } else if (!QString::compare(m_pCPart->cmd,"blame")|| - !QString::compare(m_pCPart->cmd,"annotate")) { - slotCmd=SLOT(slotCmd_blame()); - } else if (!QString::compare(m_pCPart->cmd,"update")) { - slotCmd=SLOT(slotCmd_update()); + } else if (!TQString::compare(m_pCPart->cmd,"help")) { + slotCmd=TQT_SLOT(slotCmd_help()); + } else if (!TQString::compare(m_pCPart->cmd,"blame")|| + !TQString::compare(m_pCPart->cmd,"annotate")) { + slotCmd=TQT_SLOT(slotCmd_blame()); + } else if (!TQString::compare(m_pCPart->cmd,"update")) { + slotCmd=TQT_SLOT(slotCmd_update()); m_pCPart->single_revision=true; - } else if (!QString::compare(m_pCPart->cmd,"diff")) { + } else if (!TQString::compare(m_pCPart->cmd,"diff")) { m_pCPart->start = svn::Revision::WORKING; - slotCmd=SLOT(slotCmd_diff()); - } else if (!QString::compare(m_pCPart->cmd,"info")) { - slotCmd=SLOT(slotCmd_info()); + slotCmd=TQT_SLOT(slotCmd_diff()); + } else if (!TQString::compare(m_pCPart->cmd,"info")) { + slotCmd=TQT_SLOT(slotCmd_info()); m_pCPart->single_revision=true; - } else if (!QString::compare(m_pCPart->cmd,"commit")|| - !QString::compare(m_pCPart->cmd,"ci")) { - slotCmd=SLOT(slotCmd_commit()); - } else if (!QString::compare(m_pCPart->cmd,"list")|| - !QString::compare(m_pCPart->cmd,"ls")) { - slotCmd=SLOT(slotCmd_list()); - } else if (!QString::compare(m_pCPart->cmd,"copy")|| - !QString::compare(m_pCPart->cmd,"cp")) { - slotCmd=SLOT(slotCmd_copy()); + } else if (!TQString::compare(m_pCPart->cmd,"commit")|| + !TQString::compare(m_pCPart->cmd,"ci")) { + slotCmd=TQT_SLOT(slotCmd_commit()); + } else if (!TQString::compare(m_pCPart->cmd,"list")|| + !TQString::compare(m_pCPart->cmd,"ls")) { + slotCmd=TQT_SLOT(slotCmd_list()); + } else if (!TQString::compare(m_pCPart->cmd,"copy")|| + !TQString::compare(m_pCPart->cmd,"cp")) { + slotCmd=TQT_SLOT(slotCmd_copy()); dont_check_second = true; - } else if (!QString::compare(m_pCPart->cmd,"move")|| - !QString::compare(m_pCPart->cmd,"rename")|| - !QString::compare(m_pCPart->cmd,"mv")) { - slotCmd=SLOT(slotCmd_move()); + } else if (!TQString::compare(m_pCPart->cmd,"move")|| + !TQString::compare(m_pCPart->cmd,"rename")|| + !TQString::compare(m_pCPart->cmd,"mv")) { + slotCmd=TQT_SLOT(slotCmd_move()); dont_check_second = true; - } else if (!QString::compare(m_pCPart->cmd,"checkout")|| - !QString::compare(m_pCPart->cmd,"co")) { - slotCmd=SLOT(slotCmd_checkout()); + } else if (!TQString::compare(m_pCPart->cmd,"checkout")|| + !TQString::compare(m_pCPart->cmd,"co")) { + slotCmd=TQT_SLOT(slotCmd_checkout()); dont_check_second = true; - } else if (!QString::compare(m_pCPart->cmd,"checkoutto")|| - !QString::compare(m_pCPart->cmd,"coto")) { - slotCmd=SLOT(slotCmd_checkoutto()); + } else if (!TQString::compare(m_pCPart->cmd,"checkoutto")|| + !TQString::compare(m_pCPart->cmd,"coto")) { + slotCmd=TQT_SLOT(slotCmd_checkoutto()); dont_check_second = true; - } else if (!QString::compare(m_pCPart->cmd,"export")) { - slotCmd=SLOT(slotCmd_export()); + } else if (!TQString::compare(m_pCPart->cmd,"export")) { + slotCmd=TQT_SLOT(slotCmd_export()); dont_check_second = true; - } else if (!QString::compare(m_pCPart->cmd,"exportto")) { - slotCmd=SLOT(slotCmd_exportto()); + } else if (!TQString::compare(m_pCPart->cmd,"exportto")) { + slotCmd=TQT_SLOT(slotCmd_exportto()); dont_check_second = true; - } else if (!QString::compare(m_pCPart->cmd,"delete")|| - !QString::compare(m_pCPart->cmd,"del")|| - !QString::compare(m_pCPart->cmd,"rm")|| - !QString::compare(m_pCPart->cmd,"remove")) { - slotCmd=SLOT(slotCmd_delete()); - } else if (!QString::compare(m_pCPart->cmd,"add")) { - slotCmd=SLOT(slotCmd_add()); + } else if (!TQString::compare(m_pCPart->cmd,"delete")|| + !TQString::compare(m_pCPart->cmd,"del")|| + !TQString::compare(m_pCPart->cmd,"rm")|| + !TQString::compare(m_pCPart->cmd,"remove")) { + slotCmd=TQT_SLOT(slotCmd_delete()); + } else if (!TQString::compare(m_pCPart->cmd,"add")) { + slotCmd=TQT_SLOT(slotCmd_add()); dont_check_all = true; path_only=true; - } else if (!QString::compare(m_pCPart->cmd,"undo")|| - !QString::compare(m_pCPart->cmd,"revert")) { - slotCmd=SLOT(slotCmd_revert()); - } else if (!QString::compare(m_pCPart->cmd,"checknew")|| - !QString::compare(m_pCPart->cmd,"addnew")) { - slotCmd=SLOT(slotCmd_addnew()); - } else if (!QString::compare(m_pCPart->cmd,"switch")) { - slotCmd=SLOT(slotCmd_switch()); - } else if (!QString::compare(m_pCPart->cmd,"tree")) { - slotCmd=SLOT(slotCmd_tree()); - } else if (!QString::compare(m_pCPart->cmd,"lock")) { - slotCmd=SLOT(slotCmd_lock()); + } else if (!TQString::compare(m_pCPart->cmd,"undo")|| + !TQString::compare(m_pCPart->cmd,"revert")) { + slotCmd=TQT_SLOT(slotCmd_revert()); + } else if (!TQString::compare(m_pCPart->cmd,"checknew")|| + !TQString::compare(m_pCPart->cmd,"addnew")) { + slotCmd=TQT_SLOT(slotCmd_addnew()); + } else if (!TQString::compare(m_pCPart->cmd,"switch")) { + slotCmd=TQT_SLOT(slotCmd_switch()); + } else if (!TQString::compare(m_pCPart->cmd,"tree")) { + slotCmd=TQT_SLOT(slotCmd_tree()); + } else if (!TQString::compare(m_pCPart->cmd,"lock")) { + slotCmd=TQT_SLOT(slotCmd_lock()); no_revision = true; check_force=true; - } else if (!QString::compare(m_pCPart->cmd,"unlock")) { - slotCmd=SLOT(slotCmd_unlock()); + } else if (!TQString::compare(m_pCPart->cmd,"unlock")) { + slotCmd=TQT_SLOT(slotCmd_unlock()); no_revision=true; check_force=true; } - bool found = connect(this,SIGNAL(executeMe()),this,slotCmd.ascii()); + bool found = connect(this,TQT_SIGNAL(executeMe()),this,slotCmd.ascii()); if (!found) { - slotCmd=i18n("Command \"%1\" not implemented or known").arg(m_pCPart->cmd); + slotCmd=i18n("Command \"%1\" not implemented or known").tqarg(m_pCPart->cmd); KMessageBox::sorry(0,slotCmd,i18n("SVN Error")); return -1; } - QString tmp,query,proto,v; - QMap q; + TQString tmp,query,proto,v; + TQMap q; KURL tmpurl; - QString mainProto; - QString _baseurl; + TQString mainProto; + TQString _baseurl; for (int j = 2; jargs->count();++j) { tmpurl = helpers::KTranslateUrl::translateSystemUrl(m_pCPart->args->url(j).prettyURL()); query = tmpurl.query(); q = m_pCPart->args->url(j).queryItems(); - if (q.find("rev")!=q.end()) { + if (q.tqfind("rev")!=q.end()) { v = q["rev"]; } else { v = ""; } tmpurl.setProtocol(svn::Url::transformProtokoll(tmpurl.protocol())); - if (tmpurl.protocol().find("ssh")!=-1) { + if (tmpurl.protocol().tqfind("ssh")!=-1) { SshAgent ag; // this class itself checks if done before ag.addSshIdentities(); @@ -260,7 +260,7 @@ int CommandExec::exec() tmp = tmpurl.path(); } } - QStringList l = QStringList::split('?',tmp); + TQStringList l = TQStringList::split('?',tmp); if (l.count()>0) { tmp=l[0]; } @@ -303,7 +303,7 @@ int CommandExec::exec() m_pCPart->outfile = m_pCPart->args->getOption("o"); } if (m_pCPart->args->isSet("l")) { - QString s = m_pCPart->args->getOption("l"); + TQString s = m_pCPart->args->getOption("l"); m_pCPart->log_limit = s.toInt(); if (m_pCPart->log_limit<0) { m_pCPart->log_limit = 0; @@ -314,13 +314,13 @@ int CommandExec::exec() if (Kdesvnsettings::self()->cmdline_show_logwindow() && m_lastMessagesLines >= Kdesvnsettings::self()->cmdline_log_minline()) { KDialogBase dlg ( - KApplication::activeModalWidget(), + TQT_TQWIDGET(KApplication::activeModalWidget()), "execution_log", true, i18n("Execution log"), KDialogBase::Ok); - QWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); KTextBrowser*ptr = new KTextBrowser(Dialog1Layout); ptr->setText(m_lastMessages); dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()),"kdesvn_cmd_log")); @@ -333,9 +333,9 @@ int CommandExec::exec() /*! - \fn CommandExec::clientException(const QString&) + \fn CommandExec::clientException(const TQString&) */ -void CommandExec::clientException(const QString&what) +void CommandExec::clientException(const TQString&what) { m_pCPart->Stderr<extraRevisions.find(0)!=m_pCPart->extraRevisions.end()) { + if (m_pCPart->extraRevisions.tqfind(0)!=m_pCPart->extraRevisions.end()) { m_pCPart->rev_set=true; m_pCPart->start=m_pCPart->extraRevisions[0]; } else { @@ -423,7 +423,7 @@ void CommandExec::slotCmd_cat() void CommandExec::slotCmd_get() { - if (m_pCPart->extraRevisions.find(0)!=m_pCPart->extraRevisions.end()) { + if (m_pCPart->extraRevisions.tqfind(0)!=m_pCPart->extraRevisions.end()) { m_pCPart->rev_set=true; m_pCPart->start=m_pCPart->extraRevisions[0]; } else { @@ -454,12 +454,12 @@ void CommandExec::slotCmd_diff() } else { svn::Revision r1 = svn::Revision::HEAD; svn::Revision r2 = svn::Revision::HEAD; - if (m_pCPart->extraRevisions.find(0)!=m_pCPart->extraRevisions.end()) { + if (m_pCPart->extraRevisions.tqfind(0)!=m_pCPart->extraRevisions.end()) { r1 = m_pCPart->extraRevisions[0]; } else if (!svn::Url::isValid(m_pCPart->url[0])) { r1 = svn::Revision::WORKING; } - if (m_pCPart->extraRevisions.find(1)!=m_pCPart->extraRevisions.end()) { + if (m_pCPart->extraRevisions.tqfind(1)!=m_pCPart->extraRevisions.end()) { r2 = m_pCPart->extraRevisions[1]; } else if (!svn::Url::isValid(m_pCPart->url[1])) { r2 = svn::Revision::WORKING; @@ -470,7 +470,7 @@ void CommandExec::slotCmd_diff() void CommandExec::slotCmd_info() { - if (m_pCPart->extraRevisions.find(0)!=m_pCPart->extraRevisions.end()) { + if (m_pCPart->extraRevisions.tqfind(0)!=m_pCPart->extraRevisions.end()) { m_pCPart->rev_set=true; m_pCPart->start=m_pCPart->extraRevisions[0]; } @@ -479,7 +479,7 @@ void CommandExec::slotCmd_info() void CommandExec::slotCmd_commit() { - QValueList targets; + TQValueList targets; for (unsigned j=0; jurl.count();++j) { targets.push_back(svn::Path(m_pCPart->url[j])); } @@ -499,7 +499,7 @@ void CommandExec::slotCmd_list() return; } for (unsigned int i = 0; i < res.count();++i) { - QString d = svn::DateTime(res[i]->time()).toString(QString("yyyy-MM-dd hh:mm::ss")); + TQString d = svn::DateTime(res[i]->time()).toString(TQString("yyyy-MM-dd hh:mm::ss")); m_pCPart->Stdout << (res[i]->kind()==svn_node_dir?"D":"F")<<" " << d << " " @@ -509,7 +509,7 @@ void CommandExec::slotCmd_list() void CommandExec::slotCmd_copy() { - QString target; + TQString target; if (m_pCPart->url.count()<2) { bool force_move,ok; target = CopyMoveView_impl::getMoveCopyTo(&ok,&force_move,false, @@ -520,7 +520,7 @@ void CommandExec::slotCmd_copy() } else { target = m_pCPart->url[1]; } - if (m_pCPart->extraRevisions.find(0)!=m_pCPart->extraRevisions.end()) { + if (m_pCPart->extraRevisions.tqfind(0)!=m_pCPart->extraRevisions.end()) { m_pCPart->rev_set=true; m_pCPart->start=m_pCPart->extraRevisions[0]; } else { @@ -533,7 +533,7 @@ void CommandExec::slotCmd_move() { bool force_move,ok; force_move = false; - QString target; + TQString target; if (m_pCPart->url.count()<2) { target = CopyMoveView_impl::getMoveCopyTo(&ok,&force_move,true, m_pCPart->url[0],"",0,"move_name"); @@ -571,8 +571,8 @@ void CommandExec::slotCmd_addnew() */ bool CommandExec::scanRevision() { - QString revstring = m_pCPart->args->getOption("r"); - QStringList revl = QStringList::split(":",revstring); + TQString revstring = m_pCPart->args->getOption("r"); + TQStringList revl = TQStringList::split(":",revstring); if (revl.count()==0) { return false; } @@ -584,7 +584,7 @@ bool CommandExec::scanRevision() return true; } -void CommandExec::slotNotifyMessage(const QString&msg) +void CommandExec::slotNotifyMessage(const TQString&msg) { m_pCPart->m_SvnWrapper->slotExtraLogMsg(msg); if (Kdesvnsettings::self()->cmdline_show_logwindow()) { @@ -596,19 +596,19 @@ void CommandExec::slotNotifyMessage(const QString&msg) bool CommandExec::askRevision() { - QString _head = m_pCPart->cmd+" - Revision"; + TQString _head = m_pCPart->cmd+" - Revision"; KDialogBase dlg( 0, "Revisiondlg", true, _head, KDialogBase::Ok|KDialogBase::Cancel); - QWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); Rangeinput_impl*rdlg; rdlg = new Rangeinput_impl(Dialog1Layout); - dlg.resize( QSize(120,60).expandedTo(dlg.minimumSizeHint())); + dlg.resize( TQSize(120,60).expandedTo(dlg.tqminimumSizeHint())); rdlg->setStartOnly(m_pCPart->single_revision); - if (dlg.exec()==QDialog::Accepted) { + if (dlg.exec()==TQDialog::Accepted) { Rangeinput_impl::revision_range range = rdlg->getRange(); m_pCPart->start = range.first; m_pCPart->end = range.second; @@ -624,12 +624,12 @@ bool CommandExec::askRevision() */ void CommandExec::slotCmd_switch() { - QString base; + TQString base; if (m_pCPart->url.count()>1) { clientException(i18n("May only switch one url at time!")); return; } - if (m_pCPart->baseUrls.find(0)==m_pCPart->baseUrls.end()) { + if (m_pCPart->baseUrls.tqfind(0)==m_pCPart->baseUrls.end()) { clientException(i18n("Switch only on working copies!")); return; } diff --git a/src/svnfrontend/commandexec.h b/src/svnfrontend/commandexec.h index bd8f16e..ec66fe7 100644 --- a/src/svnfrontend/commandexec.h +++ b/src/svnfrontend/commandexec.h @@ -20,8 +20,8 @@ #ifndef COMMANDEXEC_H #define COMMANDEXEC_H -#include -#include +#include +#include class KCmdLineArgs; class KURL; @@ -34,17 +34,18 @@ namespace svn { /** @author Rajko Albrecht */ -class CommandExec : public QObject +class CommandExec : public TQObject { Q_OBJECT + TQ_OBJECT public: - CommandExec(QObject*parent,const char *name,KCmdLineArgs *args); + CommandExec(TQObject*tqparent,const char *name,KCmdLineArgs *args); virtual ~CommandExec(); virtual int exec(); protected slots: - virtual void clientException(const QString&); - virtual void slotNotifyMessage(const QString&); + virtual void clientException(const TQString&); + virtual void slotNotifyMessage(const TQString&); virtual void slotCmd_log(); virtual void slotCmd_update(); virtual void slotCmd_diff(); @@ -74,7 +75,7 @@ protected: virtual bool scanRevision(); virtual bool askRevision(); - QString m_lastMessages; + TQString m_lastMessages; unsigned int m_lastMessagesLines; private: diff --git a/src/svnfrontend/copymoveview.ui b/src/svnfrontend/copymoveview.ui index 260f333..c567484 100644 --- a/src/svnfrontend/copymoveview.ui +++ b/src/svnfrontend/copymoveview.ui @@ -1,10 +1,10 @@ CopyMoveView - + CopyMoveView - + 0 0 @@ -19,14 +19,14 @@ unnamed - + m_HeadOneLabel <p align="right">Rename</p> - + WordBreak|AlignVCenter|AlignLeft @@ -37,24 +37,24 @@ this long text - + AlignCenter - + m_HeadTwoLabel to - + AlignVCenter|AlignLeft - + - layout5 + tqlayout5 @@ -67,7 +67,7 @@ /there/ - + AlignVCenter|AlignRight @@ -78,7 +78,7 @@ - + m_ForceBox @@ -93,7 +93,7 @@ - + ksqueezedtextlabel.h ksqueezedtextlabel.h diff --git a/src/svnfrontend/copymoveview_impl.cpp b/src/svnfrontend/copymoveview_impl.cpp index 24d3114..bfcd2ea 100644 --- a/src/svnfrontend/copymoveview_impl.cpp +++ b/src/svnfrontend/copymoveview_impl.cpp @@ -21,15 +21,15 @@ #include "copymoveview_impl.h" #include -#include -#include +#include +#include #include #include #include -#include +#include -CopyMoveView_impl::CopyMoveView_impl(const QString&baseName,const QString&sourceName,bool move,QWidget* parent, const char* name, WFlags fl) -: CopyMoveView(parent,name,fl) +CopyMoveView_impl::CopyMoveView_impl(const TQString&baseName,const TQString&sourceName,bool move,TQWidget* tqparent, const char* name, WFlags fl) +: CopyMoveView(tqparent,name,fl) { m_BaseName = baseName; if (m_BaseName.length()>0 && !m_BaseName.endsWith("/")) { @@ -39,7 +39,7 @@ CopyMoveView_impl::CopyMoveView_impl(const QString&baseName,const QString&source m_OldNameLabel->setText(""+sourceName+""); m_OldName = sourceName; if (m_BaseName.length()>0) { - QString t = m_OldName.right(m_OldName.length()-m_BaseName.length()); + TQString t = m_OldName.right(m_OldName.length()-m_BaseName.length()); m_NewNameInput->setText(t); } else { m_PrefixLabel->hide(); @@ -61,7 +61,7 @@ CopyMoveView_impl::~CopyMoveView_impl() /*! \fn CopyMoveView_impl::newName() */ -QString CopyMoveView_impl::newName() +TQString CopyMoveView_impl::newName() { return m_BaseName+m_NewNameInput->text(); } @@ -77,19 +77,19 @@ bool CopyMoveView_impl::force() /*! - \fn CopyMoveView_impl::getMoveCopyTo(bool*ok,bool*force,const QString&old,const QString&base,QWidget*) + \fn CopyMoveView_impl::getMoveCopyTo(bool*ok,bool*force,const TQString&old,const TQString&base,TQWidget*) */ -QString CopyMoveView_impl::getMoveCopyTo(bool*ok,bool*force,bool move, - const QString&old,const QString&base,QWidget*parent,const char*name) +TQString CopyMoveView_impl::getMoveCopyTo(bool*ok,bool*force,bool move, + const TQString&old,const TQString&base,TQWidget*tqparent,const char*name) { - KDialogBase dlg(parent,name,true,(move?i18n("Move/Rename file/dir"):i18n("Copy file/dir")), + KDialogBase dlg(tqparent,name,true,(move?i18n("Move/Rename file/dir"):i18n("Copy file/dir")), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::NoDefault); - QWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); CopyMoveView_impl*ptr=new CopyMoveView_impl(base,old,(move),Dialog1Layout); - QString nName = QString::null; - dlg.resize( QSize(500,160).expandedTo(dlg.minimumSizeHint()) ); - if (dlg.exec()!=QDialog::Accepted) { + TQString nName = TQString(); + dlg.resize( TQSize(500,160).expandedTo(dlg.tqminimumSizeHint()) ); + if (dlg.exec()!=TQDialog::Accepted) { if (ok) *ok = false; } else { if (force) *force = ptr->force(); diff --git a/src/svnfrontend/copymoveview_impl.h b/src/svnfrontend/copymoveview_impl.h index 2c17fd1..c6871f5 100644 --- a/src/svnfrontend/copymoveview_impl.h +++ b/src/svnfrontend/copymoveview_impl.h @@ -26,14 +26,15 @@ class CopyMoveView_impl : public CopyMoveView { Q_OBJECT + TQ_OBJECT public: - CopyMoveView_impl(const QString&baseName,const QString&sourceName,bool move,QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + CopyMoveView_impl(const TQString&baseName,const TQString&sourceName,bool move,TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~CopyMoveView_impl(); - virtual QString newName(); + virtual TQString newName(); bool force(); - static QString getMoveCopyTo(bool*ok,bool*force,bool move, const QString&old,const QString&base, - QWidget*,const char*name); + static TQString getMoveCopyTo(bool*ok,bool*force,bool move, const TQString&old,const TQString&base, + TQWidget*,const char*name); /*$PUBLIC_FUNCTIONS$*/ public slots: @@ -46,8 +47,8 @@ protected slots: /*$PROTECTED_SLOTS$*/ protected: - QString m_OldName; - QString m_BaseName; + TQString m_OldName; + TQString m_BaseName; }; #endif diff --git a/src/svnfrontend/createrepo_dlg.ui b/src/svnfrontend/createrepo_dlg.ui index f2b2440..69194a5 100644 --- a/src/svnfrontend/createrepo_dlg.ui +++ b/src/svnfrontend/createrepo_dlg.ui @@ -1,10 +1,10 @@ CreateRepo_Dlg - + CreateRepo_Dlg - + 0 0 @@ -19,22 +19,22 @@ unnamed - + - layout1 + tqlayout1 unnamed - + textLabel2 Type of repository: - + AlignVCenter|AlignRight @@ -67,20 +67,20 @@ 18 - + textLabel1 Path to repository: - + AlignVCenter|AlignRight - + m_DisableFsync @@ -91,7 +91,7 @@ - + m_LogKeep @@ -102,7 +102,7 @@ - + m_CreateMainDirs @@ -119,10 +119,10 @@ Create trunk, tags and branches folder - If this is set then the base layout (<tt>/trunk</tt>,<tt>/branches</tt> and <tt>/tags</tt>) will created after opening the fresh repository. + If this is set then the base tqlayout (<tt>/trunk</tt>,<tt>/branches</tt> and <tt>/tags</tt>) will created after opening the fresh repository. - + m_svn13compat @@ -142,7 +142,7 @@ If set, the repository created will compatible to subversion prior 1.4. This is only usefull when svnqt is running with subversion 1.4 or above. - + m_svn14compat @@ -192,12 +192,12 @@ m_svn13compat m_svn14compat - + fsTypeChanged(int) compatChanged13(bool) compatChanged14(bool) - - + + kcombobox.h kurlrequester.h diff --git a/src/svnfrontend/createrepo_impl.cpp b/src/svnfrontend/createrepo_impl.cpp index 160f0ab..5fdd126 100644 --- a/src/svnfrontend/createrepo_impl.cpp +++ b/src/svnfrontend/createrepo_impl.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include class RecurseCheck { @@ -34,8 +34,8 @@ public: ~RecurseCheck(){value = false;} }; -Createrepo_impl::Createrepo_impl(bool enable_compat13, bool enable_compat14, QWidget *parent, const char *name) - :CreateRepo_Dlg(parent, name) +Createrepo_impl::Createrepo_impl(bool enable_compat13, bool enable_compat14, TQWidget *tqparent, const char *name) + :CreateRepo_Dlg(tqparent, name) { inChangeCompat=true; m_DisableFsync->setEnabled(false); @@ -61,17 +61,17 @@ void Createrepo_impl::fsTypeChanged(int which) m_LogKeep->setEnabled(which==1); } -QString Createrepo_impl::targetDir() +TQString Createrepo_impl::targetDir() { KURL u = m_ReposPathinput->url(); - QString res = u.path(); + TQString res = u.path(); while (res.endsWith("/")) { res.truncate(res.length()-1); } return res; } -QString Createrepo_impl::fsType() +TQString Createrepo_impl::fsType() { return m_FilesystemSelector->currentText(); } diff --git a/src/svnfrontend/createrepo_impl.h b/src/svnfrontend/createrepo_impl.h index 14f2743..6fab516 100644 --- a/src/svnfrontend/createrepo_impl.h +++ b/src/svnfrontend/createrepo_impl.h @@ -24,10 +24,11 @@ class Createrepo_impl: public CreateRepo_Dlg { Q_OBJECT + TQ_OBJECT public: - Createrepo_impl(bool enable_compat13,bool enable_compat14, QWidget *parent = 0, const char *name = 0); - QString targetDir(); - QString fsType(); + Createrepo_impl(bool enable_compat13,bool enable_compat14, TQWidget *tqparent = 0, const char *name = 0); + TQString targetDir(); + TQString fsType(); bool disableFsync(); bool keepLogs(); bool createMain(); diff --git a/src/svnfrontend/dummydisplay.cpp b/src/svnfrontend/dummydisplay.cpp index 75037e2..045bc84 100644 --- a/src/svnfrontend/dummydisplay.cpp +++ b/src/svnfrontend/dummydisplay.cpp @@ -29,7 +29,7 @@ DummyDisplay::~DummyDisplay() { } -QWidget*DummyDisplay::realWidget() +TQWidget*DummyDisplay::realWidget() { return 0L; } @@ -39,7 +39,7 @@ SvnItem*DummyDisplay::Selected() return 0L; } -void DummyDisplay::SelectionList(QPtrList*) +void DummyDisplay::SelectionList(TQPtrList*) { } diff --git a/src/svnfrontend/dummydisplay.h b/src/svnfrontend/dummydisplay.h index 255a35c..2a9b89d 100644 --- a/src/svnfrontend/dummydisplay.h +++ b/src/svnfrontend/dummydisplay.h @@ -30,9 +30,9 @@ class DummyDisplay : public ItemDisplay public: DummyDisplay(); virtual ~DummyDisplay(); - virtual QWidget*realWidget(); + virtual TQWidget*realWidget(); virtual SvnItem*Selected(); - virtual void SelectionList(QPtrList*); + virtual void SelectionList(TQPtrList*); virtual bool openURL( const KURL &url,bool noReinit=false ); virtual SvnItem*SelectedOrMain(); }; diff --git a/src/svnfrontend/dumprepo_dlg.ui b/src/svnfrontend/dumprepo_dlg.ui index 8799419..af92bfd 100644 --- a/src/svnfrontend/dumprepo_dlg.ui +++ b/src/svnfrontend/dumprepo_dlg.ui @@ -1,10 +1,10 @@ DumpRepoDlg - + DumpRepoDlg - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout1 + tqlayout1 @@ -35,25 +35,25 @@ 18 - + m_RepoLabel Repository to dump: - + AlignVCenter|AlignRight - + m_OutfileLabel Dump into: - + AlignVCenter|AlignRight @@ -64,7 +64,7 @@ - + m_incrementalDump @@ -78,7 +78,7 @@ true - + m_UseDeltas @@ -92,7 +92,7 @@ true - + m_Rangeonly @@ -103,33 +103,33 @@ - + - layout6 + tqlayout6 unnamed - + textLabel2 End revision: - + AlignVCenter|AlignRight - + textLabel1 Start revision: - + AlignVCenter|AlignRight @@ -181,10 +181,10 @@ slotDumpRange(bool) - + slotDumpRange(bool) - - + + kurlrequester.h klineedit.h diff --git a/src/svnfrontend/dumprepo_impl.cpp b/src/svnfrontend/dumprepo_impl.cpp index dfaeb69..577c0bd 100644 --- a/src/svnfrontend/dumprepo_impl.cpp +++ b/src/svnfrontend/dumprepo_impl.cpp @@ -25,10 +25,10 @@ #include #include -#include +#include -DumpRepo_impl::DumpRepo_impl(QWidget *parent, const char *name) - :DumpRepoDlg(parent, name) +DumpRepo_impl::DumpRepo_impl(TQWidget *tqparent, const char *name) + :DumpRepoDlg(tqparent, name) { } @@ -42,10 +42,10 @@ void DumpRepo_impl::slotDumpRange(bool how) /*! \fn DumpRepo_impl::reposPath() */ -QString DumpRepo_impl::reposPath() +TQString DumpRepo_impl::reposPath() { KURL u = m_ReposPath->url(); - QString res = u.path(); + TQString res = u.path(); while (res.endsWith("/")) { res.truncate(res.length()-1); } @@ -56,10 +56,10 @@ QString DumpRepo_impl::reposPath() /*! \fn DumpRepo_impl::targetFile() */ -QString DumpRepo_impl::targetFile() +TQString DumpRepo_impl::targetFile() { KURL u = m_OutputFile->url(); - QString res = u.path(); + TQString res = u.path(); while (res.endsWith("/")) { res.truncate(res.length()-1); } diff --git a/src/svnfrontend/dumprepo_impl.h b/src/svnfrontend/dumprepo_impl.h index 6e58256..8b947d7 100644 --- a/src/svnfrontend/dumprepo_impl.h +++ b/src/svnfrontend/dumprepo_impl.h @@ -24,10 +24,11 @@ class DumpRepo_impl: public DumpRepoDlg { Q_OBJECT + TQ_OBJECT public: - DumpRepo_impl(QWidget *parent = 0, const char *name = 0); - QString reposPath(); - QString targetFile(); + DumpRepo_impl(TQWidget *tqparent = 0, const char *name = 0); + TQString reposPath(); + TQString targetFile(); bool incremental(); bool use_deltas(); bool useNumbers(); diff --git a/src/svnfrontend/editproperty_impl.cpp b/src/svnfrontend/editproperty_impl.cpp index eef6218..8fe82fe 100644 --- a/src/svnfrontend/editproperty_impl.cpp +++ b/src/svnfrontend/editproperty_impl.cpp @@ -17,9 +17,9 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include -#include -#include +#include +#include +#include #include #include @@ -30,8 +30,8 @@ #include "editproperty_impl.h" -EditProperty_impl::EditProperty_impl(QWidget *parent, const char *name) - :EditPropsDlgData(parent, name) +EditProperty_impl::EditProperty_impl(TQWidget *tqparent, const char *name) + :EditPropsDlgData(tqparent, name) { /// @TODO Read these values from a text or config file fileProperties += ("svn:eol-style"); @@ -44,7 +44,7 @@ EditProperty_impl::EditProperty_impl(QWidget *parent, const char *name) fileComments += i18n("If present, make the file executable.
" "This property can not be set on a directory. " "A non-recursive attempt will fail, and a recursive attempt " - "will set the property only on the file children of the folder."); + "will set the property only on the file tqchildren of the folder."); fileComments += i18n("Keywords to be expanded into the contents of a file.
" "They can be inserted into documents by placing a keyword anchor " "which is formatted as $KeywordName$.
" @@ -80,7 +80,7 @@ EditProperty_impl::EditProperty_impl(QWidget *parent, const char *name) dirComments += i18n("If present, make the file executable.
" "This property can not be set on a directory. " "A non-recursive attempt will fail, and a recursive attempt " - "will set the property only on the file children of the folder."); + "will set the property only on the file tqchildren of the folder."); /* TRANSLATORS: Do not translate "example" in the URL because this is according TRANSLATORS: to http://www.rfc-editor.org/rfc/rfc2606.txt a reserved URL.*/ dirComments += i18n("A newline separated list of module specifiers, each " @@ -122,8 +122,8 @@ EditProperty_impl::EditProperty_impl(QWidget *parent, const char *name) m_NameEdit->setHistoryItems(fileProperties, true); isDir = false; - QToolTip::add(m_NameEdit, "Select or enter new property"); - connect(m_NameEdit, SIGNAL(activated(const QString &)), this, SLOT(updateToolTip(const QString &))); + TQToolTip::add(m_NameEdit, "Select or enter new property"); + connect(m_NameEdit, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateToolTip(const TQString &))); } @@ -132,19 +132,19 @@ EditProperty_impl::~EditProperty_impl() { } -void EditProperty_impl::updateToolTip(const QString & selection) +void EditProperty_impl::updateToolTip(const TQString & selection) { int i; if (isDir) { - i = dirProperties.findIndex(selection); + i = dirProperties.tqfindIndex(selection); if (i >= 0) { comment = dirComments[i]; } else { comment = "No help for this property available"; } } else { - i = fileProperties.findIndex(selection); + i = fileProperties.tqfindIndex(selection); if (i >= 0) { comment = fileComments[i]; } else { @@ -152,7 +152,7 @@ void EditProperty_impl::updateToolTip(const QString & selection) } } - QToolTip::add(m_NameEdit, comment); + TQToolTip::add(m_NameEdit, comment); } void EditProperty_impl::setDir(bool dir) @@ -173,18 +173,18 @@ void EditProperty_impl::setDir(bool dir) } -QString EditProperty_impl::propName()const +TQString EditProperty_impl::propName()const { return m_NameEdit->currentText(); } -QString EditProperty_impl::propValue()const +TQString EditProperty_impl::propValue()const { return m_ValueEdit->text(); } -void EditProperty_impl::setPropName(const QString&n) +void EditProperty_impl::setPropName(const TQString&n) { m_NameEdit->addToHistory(n); m_NameEdit->setCurrentItem(n); @@ -192,17 +192,17 @@ void EditProperty_impl::setPropName(const QString&n) } -void EditProperty_impl::setPropValue(const QString&v) +void EditProperty_impl::setPropValue(const TQString&v) { m_ValueEdit->setText(v); } void EditProperty_impl::showHelp() { - QPoint pos = m_ValueEdit->pos(); + TQPoint pos = m_ValueEdit->pos(); pos.setX(pos.x() + m_ValueEdit->width()/2); pos.setY(pos.y() + m_ValueEdit->height()/4); - QWhatsThis::display(comment, mapToGlobal(pos)); + TQWhatsThis::display(comment, mapToGlobal(pos)); } diff --git a/src/svnfrontend/editproperty_impl.h b/src/svnfrontend/editproperty_impl.h index 89fce30..6bf220b 100644 --- a/src/svnfrontend/editproperty_impl.h +++ b/src/svnfrontend/editproperty_impl.h @@ -22,30 +22,31 @@ #include "editpropsdlg.h" -class QStringList; -class QString; +class TQStringList; +class TQString; class EditProperty_impl: public EditPropsDlgData { Q_OBJECT + TQ_OBJECT public: - EditProperty_impl(QWidget *parent = 0, const char *name = 0); + EditProperty_impl(TQWidget *tqparent = 0, const char *name = 0); ~EditProperty_impl(); - QString propName()const; - QString propValue()const; - void setPropName(const QString&); - void setPropValue(const QString&); + TQString propName()const; + TQString propValue()const; + void setPropName(const TQString&); + void setPropValue(const TQString&); void setDir(bool dir); protected slots: - void updateToolTip(const QString&); + void updateToolTip(const TQString&); private: - QStringList fileProperties; - QStringList fileComments; - QStringList dirProperties; - QStringList dirComments; - QString comment; + TQStringList fileProperties; + TQStringList fileComments; + TQStringList dirProperties; + TQStringList dirComments; + TQString comment; bool isDir; protected slots: virtual void showHelp(); diff --git a/src/svnfrontend/editpropsdlg.ui b/src/svnfrontend/editpropsdlg.ui index 460a468..e7d6ac1 100644 --- a/src/svnfrontend/editpropsdlg.ui +++ b/src/svnfrontend/editpropsdlg.ui @@ -1,10 +1,10 @@ EditPropsDlgData - + EditPropsDlg - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout1 + tqlayout1 @@ -37,14 +37,14 @@ Expanding - + 107 20 - + buttonOk @@ -61,7 +61,7 @@ true - + buttonCancel @@ -77,9 +77,9 @@ - + - layout24 + tqlayout24 @@ -90,7 +90,7 @@ m_NameEdit - + m_NameLabel @@ -103,9 +103,9 @@ m_ValueEdit - + - layout23 + tqlayout23 @@ -121,14 +121,14 @@ Expanding - + 20 60 - + m_ValueLabel @@ -136,7 +136,7 @@ Property value: - + frame5 @@ -150,11 +150,11 @@ unnamed - + helpButton - + 36 36 @@ -185,7 +185,7 @@ Expanding - + 20 50 @@ -230,12 +230,12 @@ buttonOk buttonCancel - + nameChanged(const QString&) valueChanged() showHelp() - - + + kcombobox.h klineedit.h diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp index 19af4fe..bb5d4d5 100644 --- a/src/svnfrontend/filelistviewitem.cpp +++ b/src/svnfrontend/filelistviewitem.cpp @@ -33,8 +33,8 @@ #include #include -#include -#include +#include +#include const int FileListViewItem::COL_ICON = 0; const int FileListViewItem::COL_NAME = 0; @@ -46,21 +46,21 @@ const int FileListViewItem::COL_IS_LOCKED = 5; //const int FileListViewItem::COL_CURRENT_REV = 5; -FileListViewItem::FileListViewItem(kdesvnfilelist*_parent,const svn::StatusPtr&_stat) - : KListViewItem(_parent),SvnItem(_stat), +FileListViewItem::FileListViewItem(kdesvnfilelist*_tqparent,const svn::StatusPtr&_stat) + : KListViewItem(_tqparent),SvnItem(_stat), sortChar(0), - m_Ksvnfilelist(_parent) + m_Ksvnfilelist(_tqparent) { - m_SvnWrapper = _parent->m_SvnWrapper; + m_SvnWrapper = _tqparent->m_SvnWrapper; init(); } -FileListViewItem::FileListViewItem(kdesvnfilelist*_parent,FileListViewItem*_parentItem,const svn::StatusPtr&_stat) - : KListViewItem(_parentItem),SvnItem(_stat), +FileListViewItem::FileListViewItem(kdesvnfilelist*_tqparent,FileListViewItem*_tqparentItem,const svn::StatusPtr&_stat) + : KListViewItem(_tqparentItem),SvnItem(_stat), sortChar(0), - m_Ksvnfilelist(_parent) + m_Ksvnfilelist(_tqparent) { - m_SvnWrapper = _parent->m_SvnWrapper; + m_SvnWrapper = _tqparent->m_SvnWrapper; init(); } @@ -105,7 +105,7 @@ FileListViewItem::~FileListViewItem() if (isSelected()) { /* when item is selected and deleted signal selectionChanged isn't emitted - in QListView anymore and let kdesvn crash. + in TQListView anymore and let kdesvn crash. */ setSelected(false); m_Ksvnfilelist->selectionChanged(); @@ -118,7 +118,7 @@ void FileListViewItem::setStat(const svn::StatusPtr&stat) init(); } -void FileListViewItem::refreshStatus(bool childs,QPtrList*exclude,bool depsonly) +void FileListViewItem::refreshtqStatus(bool childs,TQPtrList*exclude,bool depsonly) { FileListViewItem*it; @@ -130,28 +130,28 @@ void FileListViewItem::refreshStatus(bool childs,QPtrList*exclude,bool if (!isValid()) { return; } - it = static_cast(parent()); + it = static_cast(tqparent()); if (!childs) { - if (it && (!exclude || exclude->find(it)==-1)) { - it->refreshStatus(false,exclude); + if (it && (!exclude || exclude->tqfind(it)==-1)) { + it->refreshtqStatus(false,exclude); } } else if (firstChild()){ it = static_cast(firstChild()); while (it) { - if (!exclude || exclude->find(it)==-1) { - it->refreshStatus(true,exclude); + if (!exclude || exclude->tqfind(it)==-1) { + it->refreshtqStatus(true,exclude); } it = static_cast(it->nextSibling()); } } - repaint(); + tqrepaint(); } void FileListViewItem::makePixmap() { int size = Kdesvnsettings::listview_icon_size(); bool overlay = Kdesvnsettings::display_overlays(); - QPixmap pm; + TQPixmap pm; if (m_Pixmap.isNull()) { pm = getPixmap(size,overlay); } else { @@ -160,21 +160,21 @@ void FileListViewItem::makePixmap() setPixmap(COL_ICON,pm); } -void FileListViewItem::setPreviewPix(const QPixmap& pixmap) +void FileListViewItem::setPreviewPix(const TQPixmap& pixmap) { if (pixmap.isNull()) return; m_Pixmap = pixmap; int size = Kdesvnsettings::listview_icon_size(); bool overlay = Kdesvnsettings::display_overlays(); - QPixmap pm = getPixmap(pixmap,size,overlay); + TQPixmap pm = getPixmap(pixmap,size,overlay); setPixmap(COL_ICON,pm); } -bool FileListViewItem::isParent(QListViewItem*which) +bool FileListViewItem::isParent(TQListViewItem*which) { if (!which) return false; - QListViewItem*item = this; - while ( (item=item->parent())) { + TQListViewItem*item = this; + while ( (item=item->tqparent())) { if (item==which) { return true; } @@ -192,11 +192,11 @@ void FileListViewItem::update() setText(COL_STATUS,infoText()); setText(COL_LAST_AUTHOR,cmtAuthor()); setText(COL_LAST_DATE,KGlobal::locale()->formatDateTime(fullDate())); - setText(COL_LAST_REV,QString("%1").arg(cmtRev())); + setText(COL_LAST_REV,TQString("%1").tqarg(cmtRev())); setText(COL_IS_LOCKED,lockOwner()); } -int FileListViewItem::compare( QListViewItem* item, int col, bool ascending ) const +int FileListViewItem::compare( TQListViewItem* item, int col, bool ascending ) const { FileListViewItem* k = static_cast( item ); if ( sortChar != k->sortChar ) { @@ -222,40 +222,40 @@ int FileListViewItem::compare( QListViewItem* item, int col, bool ascending ) co void FileListViewItem::removeChilds() { - QListViewItem*temp; + TQListViewItem*temp; while ((temp=firstChild())) { delete temp; } } -void FileListViewItem::updateStatus(const svn::StatusPtr&s) +void FileListViewItem::updatetqStatus(const svn::StatusPtr&s) { setStat(s); } SvnItem* FileListViewItem::getParentItem()const { - return static_cast(parent()); + return static_cast(tqparent()); } /*! \fn FileListViewItem::getParentDir()const */ - QString FileListViewItem::getParentDir()const + TQString FileListViewItem::getParentDir()const { SvnItem*temp = getParentItem(); - if (!temp) return QString::null; + if (!temp) return TQString(); return temp->fullName(); } -void FileListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) +void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { bool colors = Kdesvnsettings::colored_state(); if (!colors||m_bgColor==NONE) { - KListViewItem::paintCell(p,cg,column,width,alignment); + KListViewItem::paintCell(p,cg,column,width,tqalignment); return; } - QColorGroup _cg = cg; - QColor _bgColor; + TQColorGroup _cg = cg; + TQColor _bgColor; switch(m_bgColor) { case UPDATES: _bgColor = Kdesvnsettings::color_need_update(); @@ -285,23 +285,23 @@ void FileListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, _bgColor = Kdesvnsettings::color_need_lock(); break; default: - KListViewItem::paintCell(p,cg,column,width,alignment); + KListViewItem::paintCell(p,cg,column,width,tqalignment); return; break; } - const QPixmap *pm = listView()->viewport()->backgroundPixmap(); + const TQPixmap *pm = listView()->viewport()->backgroundPixmap(); if (pm && !pm->isNull()) { - _cg.setBrush(QColorGroup::Base, QBrush(_bgColor, *pm)); - QPoint o = p->brushOrigin(); + _cg.setBrush(TQColorGroup::Base, TQBrush(_bgColor, *pm)); + TQPoint o = p->brushOrigin(); p->setBrushOrigin( o.x()-listView()->contentsX(), o.y()-listView()->contentsY() ); } else { - if (listView()->viewport()->backgroundMode()==Qt::FixedColor) { - _cg.setColor(QColorGroup::Background,_bgColor); + if (listView()->viewport()->backgroundMode()==TQt::FixedColor) { + _cg.setColor(TQColorGroup::Background,_bgColor); } else { - _cg.setColor(QColorGroup::Base,_bgColor); + _cg.setColor(TQColorGroup::Base,_bgColor); } } - QListViewItem::paintCell(p, _cg, column, width, alignment); + TQListViewItem::paintCell(p, _cg, column, width, tqalignment); } const svn::Revision&FileListViewItem::correctPeg()const @@ -309,7 +309,7 @@ const svn::Revision&FileListViewItem::correctPeg()const return m_Ksvnfilelist->remoteRevision(); } -FileListViewItem*FileListViewItem::findChild(const QString&aName) +FileListViewItem*FileListViewItem::findChild(const TQString&aName) { FileListViewItem*_item = (FileListViewItem*)firstChild(); while (_item) { diff --git a/src/svnfrontend/filelistviewitem.h b/src/svnfrontend/filelistviewitem.h index e8f0d64..3c5780f 100644 --- a/src/svnfrontend/filelistviewitem.h +++ b/src/svnfrontend/filelistviewitem.h @@ -22,11 +22,11 @@ #include "svnitem.h" #include -#include -#include +#include +#include #include "src/svnqt/svnqttypes.hpp" -class QPainter; +class TQPainter; class KFileItem; class kdesvnfilelist; class SvnActions; @@ -42,34 +42,34 @@ public: FileListViewItem(kdesvnfilelist*,FileListViewItem*,const svn::StatusPtr&); virtual ~FileListViewItem(); - virtual int compare( QListViewItem* i, int col, bool ascending ) const; + virtual int compare( TQListViewItem* i, int col, bool ascending ) const; - virtual void updateStatus(const svn::StatusPtr&s); - virtual void refreshStatus(bool childs=false,QPtrList *exclude = 0,bool depsonly=false); + virtual void updatetqStatus(const svn::StatusPtr&s); + virtual void refreshtqStatus(bool childs=false,TQPtrList *exclude = 0,bool depsonly=false); #if 0 virtual void refreshMe(); #endif void removeChilds(); - bool isParent(QListViewItem*which); + bool isParent(TQListViewItem*which); static const int COL_ICON,COL_NAME,COL_LAST_REV,COL_LAST_AUTHOR,COL_LAST_DATE,COL_STATUS/*,COL_CURRENT_REV*/,COL_IS_LOCKED; - virtual QString getParentDir()const; + virtual TQString getParentDir()const; virtual SvnItem* getParentItem()const; virtual FileListViewItem*fItem(){return this;} virtual void setStat(const svn::StatusPtr&); - virtual void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment); + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); virtual void setOpen(bool o); virtual void setOpenNoBlock(bool o); - virtual void setPreviewPix(const QPixmap& pixmap); + virtual void setPreviewPix(const TQPixmap& pixmap); virtual const svn::Revision&correctPeg()const; - virtual FileListViewItem*findChild(const QString&); + virtual FileListViewItem*findChild(const TQString&); protected: - QColor m_highColor; + TQColor m_highColor; short int sortChar; kdesvnfilelist*m_Ksvnfilelist; @@ -79,10 +79,10 @@ protected: void init(); virtual SvnActions*getWrapper()const; SvnActions*m_SvnWrapper; - QPixmap m_Pixmap; + TQPixmap m_Pixmap; }; -typedef QPtrList FileListViewItemList; -typedef QPtrListIterator FileListViewItemListIterator; +typedef TQPtrList FileListViewItemList; +typedef TQPtrListIterator FileListViewItemListIterator; #endif diff --git a/src/svnfrontend/fillcachethread.cpp b/src/svnfrontend/fillcachethread.cpp index ddaa934..4930cce 100644 --- a/src/svnfrontend/fillcachethread.cpp +++ b/src/svnfrontend/fillcachethread.cpp @@ -25,19 +25,19 @@ #include "src/svnqt/cache/DatabaseException.hpp" #include "src/kdesvn_events.h" -#include +#include #include #include #include -FillCacheThread::FillCacheThread(QObject*_parent,const QString&reposRoot) - : QThread(),mutex(),m_SvnContextListener(0) +FillCacheThread::FillCacheThread(TQObject*_tqparent,const TQString&reposRoot) + : TQThread(),mutex(),m_SvnContextListener(0) { - m_Parent = _parent; + m_Parent = _tqparent; m_CurrentContext = new svn::Context(); m_SvnContextListener = new ThreadContextListener(m_Parent); - QObject::connect(m_SvnContextListener,SIGNAL(sendNotify(const QString&)),m_Parent,SLOT(slotNotifyMessage(const QString&))); + TQObject::connect(m_SvnContextListener,TQT_SIGNAL(sendNotify(const TQString&)),m_Parent,TQT_SLOT(slotNotifyMessage(const TQString&))); m_CurrentContext->setListener(m_SvnContextListener); m_what = reposRoot; @@ -51,7 +51,7 @@ FillCacheThread::~FillCacheThread() m_SvnContextListener=0; } -const QString&FillCacheThread::reposRoot()const +const TQString&FillCacheThread::reposRoot()const { return m_what; } @@ -65,21 +65,21 @@ void FillCacheThread::cancelMe() void FillCacheThread::run() { svn::Revision where = svn::Revision::HEAD; - QString ex; + TQString ex; svn::cache::ReposLog rl(m_Svnclient,m_what); bool breakit=false; KApplication*k = KApplication::kApplication(); try { svn::Revision latestCache = rl.latestCachedRev(); svn::Revision Head = rl.latestHeadRev(); - Q_LLONG i = latestCache.revnum(); + TQ_LLONG i = latestCache.revnum(); if (i<0) { i=0; } - Q_LLONG j = Head.revnum(); + TQ_LLONG j = Head.revnum(); - Q_LLONG _max=j-i; - Q_LLONG _cur=0; + TQ_LLONG _max=j-i; + TQ_LLONG _cur=0; FillCacheStatusEvent*fev; if (k) { @@ -110,13 +110,13 @@ void FillCacheThread::run() rl.fillCache(Head.revnum()); } i=Head.revnum(); - m_SvnContextListener->contextNotify(i18n("Cache filled up to revision %1").arg(i)); + m_SvnContextListener->contextNotify(i18n("Cache filled up to revision %1").tqarg(i)); } } catch (const svn::Exception&e) { m_SvnContextListener->contextNotify(e.msg()); } if (k && !breakit) { - QCustomEvent*ev = new QCustomEvent(EVENT_LOGCACHE_FINISHED); + TQCustomEvent*ev = new TQCustomEvent(EVENT_LOGCACHE_FINISHED); ev->setData((void*)this); k->postEvent(m_Parent,ev); } diff --git a/src/svnfrontend/fillcachethread.h b/src/svnfrontend/fillcachethread.h index 04b0ec2..90951c9 100644 --- a/src/svnfrontend/fillcachethread.h +++ b/src/svnfrontend/fillcachethread.h @@ -27,28 +27,28 @@ #include "eventnumbers.h" #include "frontendtypes.h" -#include -#include +#include +#include -class QObject; +class TQObject; -class FillCacheThread:public QThread +class FillCacheThread:public TQThread { public: - FillCacheThread(QObject*,const QString&reposRoot); + FillCacheThread(TQObject*,const TQString&reposRoot); virtual ~FillCacheThread(); virtual void run(); virtual void cancelMe(); - const QString&reposRoot()const; + const TQString&reposRoot()const; protected: - QMutex mutex; + TQMutex mutex; svn::Client* m_Svnclient; svn::ContextP m_CurrentContext; svn::smart_pointer m_SvnContextListener; - QObject*m_Parent; - QString m_what; + TQObject*m_Parent; + TQString m_what; }; #endif 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(); }; diff --git a/src/svnfrontend/graphtree/drawparams.cpp b/src/svnfrontend/graphtree/drawparams.cpp index ced7bd4..74e4953 100644 --- a/src/svnfrontend/graphtree/drawparams.cpp +++ b/src/svnfrontend/graphtree/drawparams.cpp @@ -19,16 +19,16 @@ /* * A Widget for visualizing hierarchical metrics as areas. - * The API is similar to QListView. + * The API is similar to TQListView. */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -52,12 +52,12 @@ StoredDrawParams::StoredDrawParams() _shaded = true; _rotated = false; - _backColor = Qt::white; + _backColor = TQt::white; // field array has size 0 } -StoredDrawParams::StoredDrawParams(QColor c, +StoredDrawParams::StoredDrawParams(TQColor c, bool selected, bool current) { _backColor = c; @@ -71,18 +71,18 @@ StoredDrawParams::StoredDrawParams(QColor c, // field array has size 0 } -QString StoredDrawParams::text(int f) const +TQString StoredDrawParams::text(int f) const { if ((f<0) || (f >= (int)_field.size())) - return QString::null; + return TQString(); return _field[f].text; } -QPixmap StoredDrawParams::pixmap(int f) const +TQPixmap StoredDrawParams::pixmap(int f) const { if ((f<0) || (f >= (int)_field.size())) - return QPixmap(); + return TQPixmap(); return _field[f].pix; } @@ -103,10 +103,10 @@ int StoredDrawParams::maxLines(int f) const return _field[f].maxLines; } -const QFont& StoredDrawParams::font() const +const TQFont& StoredDrawParams::font() const { - static QFont* f = 0; - if (!f) f = new QFont(QApplication::font()); + static TQFont* f = 0; + if (!f) f = new TQFont(TQApplication::font()); return *f; } @@ -126,7 +126,7 @@ void StoredDrawParams::ensureField(int f) } -void StoredDrawParams::setField(int f, QString t, QPixmap pm, +void StoredDrawParams::setField(int f, TQString t, TQPixmap pm, Position p, int maxLines) { if (f<0 || f>=MAX_FIELD) return; @@ -138,7 +138,7 @@ void StoredDrawParams::setField(int f, QString t, QPixmap pm, _field[f].maxLines = maxLines; } -void StoredDrawParams::setText(int f, QString t) +void StoredDrawParams::setText(int f, TQString t) { if (f<0 || f>=MAX_FIELD) return; ensureField(f); @@ -146,7 +146,7 @@ void StoredDrawParams::setText(int f, QString t) _field[f].text = t; } -void StoredDrawParams::setPixmap(int f, QPixmap pm) +void StoredDrawParams::setPixmap(int f, TQPixmap pm) { if (f<0 || f>=MAX_FIELD) return; ensureField(f); @@ -176,7 +176,7 @@ void StoredDrawParams::setMaxLines(int f, int m) // RectDrawing // -RectDrawing::RectDrawing(QRect r) +RectDrawing::RectDrawing(TQRect r) { _fm = 0; _dp = 0; @@ -205,7 +205,7 @@ void RectDrawing::setDrawParams(DrawParams* dp) _dp = dp; } -void RectDrawing::setRect(QRect r) +void RectDrawing::setRect(TQRect r) { _rect = r; @@ -219,7 +219,7 @@ void RectDrawing::setRect(QRect r) _fontHeight = 0; } -QRect RectDrawing::remainingRect(DrawParams* dp) +TQRect RectDrawing::remainingRect(DrawParams* dp) { if (!dp) dp = drawParams(); @@ -244,20 +244,20 @@ QRect RectDrawing::remainingRect(DrawParams* dp) } -void RectDrawing::drawBack(QPainter* p, DrawParams* dp) +void RectDrawing::drawBack(TQPainter* p, DrawParams* dp) { if (!dp) dp = drawParams(); if (_rect.width()<=0 || _rect.height()<=0) return; - QRect r = _rect; - QColor normal = dp->backColor(); + TQRect r = _rect; + TQColor normal = dp->backColor(); if (dp->selected()) normal = normal.light(); bool isCurrent = dp->current(); if (dp->drawFrame() || isCurrent) { // 3D raised/sunken frame effect... - QColor high = normal.light(); - QColor low = normal.dark(); + TQColor high = normal.light(); + TQColor low = normal.dark(); p->setPen( isCurrent ? low:high); p->drawLine(r.left(), r.top(), r.right(), r.top()); p->drawLine(r.left(), r.top(), r.left(), r.bottom()); @@ -270,10 +270,10 @@ void RectDrawing::drawBack(QPainter* p, DrawParams* dp) if (dp->shaded()) { // some shading - bool goDark = qGray(normal.rgb())>128; + bool goDark = tqGray(normal.rgb())>128; int rBase, gBase, bBase; normal.rgb(&rBase, &gBase, &bBase); - p->setBrush(QBrush::NoBrush); + p->setBrush(TQBrush::NoBrush); // shade parameters: int d = 7; @@ -294,7 +294,7 @@ void RectDrawing::drawBack(QPainter* p, DrawParams* dp) int gDiff = goDark ? -gBase/d : (255-gBase)/d; int bDiff = goDark ? -bBase/d : (255-bBase)/d; - QColor shadeColor; + TQColor shadeColor; while (factor<.95) { shadeColor.setRgb((int)(rBase+factor*rDiff+.5), (int)(gBase+factor*gDiff+.5), @@ -333,22 +333,22 @@ void RectDrawing::drawBack(QPainter* p, DrawParams* dp) } // fill inside - p->setPen(QPen::NoPen); + p->setPen(TQPen::NoPen); p->setBrush(normal); p->drawRect(r); } -bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) +bool RectDrawing::drawField(TQPainter* p, int f, DrawParams* dp) { if (!dp) dp = drawParams(); if (!_fm) { - _fm = new QFontMetrics(dp->font()); + _fm = new TQFontMetrics(dp->font()); _fontHeight = _fm->height(); } - QRect r = _rect; + TQRect r = _rect; if (0) kdDebug(90100) << "DrawField: Rect " << r.x() << "/" << r.y() << " - " << r.width() << "x" << r.height() << endl; @@ -488,9 +488,9 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) // get text and pixmap now, only if we need to, because it is possible // that they are calculated on demand (and this can take some time) - QString name = dp->text(f); + TQString name = dp->text(f); if (name.isEmpty()) return 0; - QPixmap pix = dp->pixmap(f); + TQPixmap pix = dp->pixmap(f); // check if pixmap can be drawn int pixW = pix.width(); @@ -529,7 +529,7 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) } p->save(); - p->setPen( (qGray(dp->backColor().rgb())>100) ? Qt::black : Qt::white); + p->setPen( (tqGray(dp->backColor().rgb())>100) ? TQt::black : TQt::white); p->setFont(dp->font()); if (rotate) { //p->translate(r.x()+2, r.y()+r.height()); @@ -552,14 +552,14 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) * If the text is to be written at the bottom, we start with the * end of the string (so everything is reverted) */ - QString remaining; + TQString remaining; int origLines = lines; while (lines>0) { if (w>width && lines>1) { int lastBreakPos = name.length(), lastWidth = w; int len = name.length(); - QChar::Category caOld, ca; + TQChar::Category caOld, ca; if (!isBottom) { // start with comparing categories of last 2 chars @@ -569,8 +569,8 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) ca = name[len-1].category(); if (ca != caOld) { // "Aa" has no break between... - if (ca == QChar::Letter_Uppercase && - caOld == QChar::Letter_Lowercase) { + if (ca == TQChar::Letter_Uppercase && + caOld == TQChar::Letter_Lowercase) { caOld = ca; continue; } @@ -584,7 +584,7 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) w = lastWidth; remaining = name.mid(lastBreakPos); // remove space on break point - if (name[lastBreakPos-1].category() == QChar::Separator_Space) + if (name[lastBreakPos-1].category() == TQChar::Separator_Space) name = name.left(lastBreakPos-1); else name = name.left(lastBreakPos); @@ -598,8 +598,8 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) if (ca != caOld) { // "Aa" has no break between... - if (caOld == QChar::Letter_Uppercase && - ca == QChar::Letter_Lowercase) { + if (caOld == TQChar::Letter_Uppercase && + ca == TQChar::Letter_Lowercase) { caOld = ca; continue; } @@ -613,14 +613,14 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) w = lastWidth; remaining = name.left(l-lastBreakPos); // remove space on break point - if (name[l-lastBreakPos].category() == QChar::Separator_Space) + if (name[l-lastBreakPos].category() == TQChar::Separator_Space) name = name.right(lastBreakPos-1); else name = name.right(lastBreakPos); } } else - remaining = QString::null; + remaining = TQString(); /* truncate and add ... if needed */ if (w>width) { @@ -659,7 +659,7 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) p->drawText( x+pixW, y, width - pixW, h, - Qt::AlignLeft, name); + TQt::AlignLeft, name); y = isBottom ? (y-h) : (y+h); lines--; diff --git a/src/svnfrontend/graphtree/drawparams.h b/src/svnfrontend/graphtree/drawparams.h index 4898111..eee2445 100644 --- a/src/svnfrontend/graphtree/drawparams.h +++ b/src/svnfrontend/graphtree/drawparams.h @@ -19,7 +19,7 @@ /** * A Widget for visualizing hierarchical metrics as areas. - * The API is similar to QListView. + * The API is similar to TQListView. * * This file defines the following classes: * DrawParams, RectDrawing, TreeMapItem, TreeMapWidget @@ -31,17 +31,17 @@ #ifndef DRAWPARAMS_H #define DRAWPARAMS_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -class QPopupMenu; -class QString; +class TQPopupMenu; +class TQString; class KConfigGroup; @@ -71,15 +71,15 @@ public: // no constructor as this is an abstract class virtual ~DrawParams() {} - virtual QString text(int) const = 0; - virtual QPixmap pixmap(int) const = 0; + virtual TQString text(int) const = 0; + virtual TQPixmap pixmap(int) const = 0; virtual Position position(int) const = 0; // 0: no limit, negative: leave at least -maxLines() free virtual int maxLines(int) const { return 0; } virtual int fieldCount() const { return 0; } - virtual QColor backColor() const { return Qt::white; } - virtual const QFont& font() const = 0; + virtual TQColor backColor() const { return TQt::white; } + virtual const TQFont& font() const = 0; virtual bool selected() const { return false; } virtual bool current() const { return false; } @@ -96,33 +96,33 @@ class StoredDrawParams: public DrawParams { public: StoredDrawParams(); - StoredDrawParams(QColor c, + StoredDrawParams(TQColor c, bool selected = false, bool current = false); // getters - QString text(int) const; - QPixmap pixmap(int) const; + TQString text(int) const; + TQPixmap pixmap(int) const; Position position(int) const; int maxLines(int) const; int fieldCount() const { return _field.size(); } - QColor backColor() const { return _backColor; } + TQColor backColor() const { return _backColor; } bool selected() const { return _selected; } bool current() const { return _current; } bool shaded() const { return _shaded; } bool rotated() const { return _rotated; } bool drawFrame() const { return _drawFrame; } - const QFont& font() const; + const TQFont& font() const; // attribute setters - void setField(int f, QString t, QPixmap pm = QPixmap(), + void setField(int f, TQString t, TQPixmap pm = TQPixmap(), Position p = Default, int maxLines = 0); - void setText(int f, QString); - void setPixmap(int f, QPixmap); + void setText(int f, TQString); + void setPixmap(int f, TQPixmap); void setPosition(int f, Position); void setMaxLines(int f, int); - void setBackColor(QColor c) { _backColor = c; } + void setBackColor(TQColor c) { _backColor = c; } void setSelected(bool b) { _selected = b; } void setCurrent(bool b) { _current = b; } void setShaded(bool b) { _shaded = b; } @@ -130,7 +130,7 @@ public: void drawFrame(bool b) { _drawFrame = b; } protected: - QColor _backColor; + TQColor _backColor; bool _selected :1; bool _current :1; bool _shaded :1; @@ -142,13 +142,13 @@ private: void ensureField(int f); struct Field { - QString text; - QPixmap pix; + TQString text; + TQPixmap pix; Position pos; int maxLines; }; - QValueVector _field; + TQValueVector _field; }; @@ -164,7 +164,7 @@ private: class RectDrawing { public: - RectDrawing(QRect); + RectDrawing(TQRect); ~RectDrawing(); // The default DrawParams object used. @@ -172,28 +172,28 @@ public: // we take control over the given object (i.e. delete at destruction) void setDrawParams(DrawParams*); - // draw on a given QPainter, use this class as info provider per default - void drawBack(QPainter*, DrawParams* dp = 0); + // draw on a given TQPainter, use this class as info provider per default + void drawBack(TQPainter*, DrawParams* dp = 0); /* Draw field at position() from pixmap()/text() with maxLines(). * Returns true if something was drawn */ - bool drawField(QPainter*, int f, DrawParams* dp = 0); + bool drawField(TQPainter*, int f, DrawParams* dp = 0); // resets rectangle for free space - void setRect(QRect); + void setRect(TQRect); // Returns the rectangle area still free of text/pixmaps after // a number of drawText() calls. - QRect remainingRect(DrawParams* dp = 0); + TQRect remainingRect(DrawParams* dp = 0); private: int _usedTopLeft, _usedTopCenter, _usedTopRight; int _usedBottomLeft, _usedBottomCenter, _usedBottomRight; - QRect _rect; + TQRect _rect; // temporary int _fontHeight; - QFontMetrics* _fm; + TQFontMetrics* _fm; DrawParams* _dp; }; diff --git a/src/svnfrontend/graphtree/elogentry.cpp b/src/svnfrontend/graphtree/elogentry.cpp index 924332c..573476b 100644 --- a/src/svnfrontend/graphtree/elogentry.cpp +++ b/src/svnfrontend/graphtree/elogentry.cpp @@ -35,7 +35,7 @@ eLog_Entry::~eLog_Entry() { } -void eLog_Entry::addCopyTo(const QString¤t,const QString&target, +void eLog_Entry::addCopyTo(const TQString¤t,const TQString&target, svn_revnum_t target_rev,char _action,svn_revnum_t from_rev) { svn::LogChangePathEntry _entry; diff --git a/src/svnfrontend/graphtree/elogentry.h b/src/svnfrontend/graphtree/elogentry.h index 0fa63ef..3bcbabc 100644 --- a/src/svnfrontend/graphtree/elogentry.h +++ b/src/svnfrontend/graphtree/elogentry.h @@ -31,7 +31,7 @@ struct eLog_Entry : public svn::LogEntry eLog_Entry(const svn::LogEntry&); ~eLog_Entry(); - void addCopyTo(const QString&,const QString&,svn_revnum_t,char _action,svn_revnum_t fromRev=-1); - void addAction(const QString&,char _action); + void addCopyTo(const TQString&,const TQString&,svn_revnum_t,char _action,svn_revnum_t fromRev=-1); + void addAction(const TQString&,char _action); }; #endif diff --git a/src/svnfrontend/graphtree/graphtreelabel.cpp b/src/svnfrontend/graphtree/graphtreelabel.cpp index 9770fef..cf51c9b 100644 --- a/src/svnfrontend/graphtree/graphtreelabel.cpp +++ b/src/svnfrontend/graphtree/graphtreelabel.cpp @@ -19,13 +19,13 @@ ***************************************************************************/ #include "graphtreelabel.h" #include "graphtree_defines.h" -#include +#include -GraphTreeLabel::GraphTreeLabel(const QString&text, const QString&_nodename,const QRect&r,QCanvas*c) - : QCanvasRectangle(r,c),StoredDrawParams() +GraphTreeLabel::GraphTreeLabel(const TQString&text, const TQString&_nodename,const TQRect&r,TQCanvas*c) + : TQCanvasRectangle(r,c),StoredDrawParams() { m_Nodename = _nodename; - m_SourceNode = QString::null; + m_SourceNode = TQString(); setText(0,text); setPosition(0, DrawParams::TopCenter); drawFrame(true); @@ -35,7 +35,7 @@ GraphTreeLabel::~GraphTreeLabel() { } -const QString&GraphTreeLabel::nodename()const +const TQString&GraphTreeLabel::nodename()const { return m_Nodename; } @@ -45,14 +45,14 @@ int GraphTreeLabel::rtti()const return GRAPHTREE_LABEL; } -void GraphTreeLabel::setBgColor(const QColor&c) +void GraphTreeLabel::setBgColor(const TQColor&c) { _backColor=c; } -void GraphTreeLabel::drawShape(QPainter& p) +void GraphTreeLabel::drawShape(TQPainter& p) { - QRect r = rect(); + TQRect r = rect(); /* p.setPen(blue); p.drawRect(r); @@ -65,23 +65,23 @@ void GraphTreeLabel::drawShape(QPainter& p) void GraphTreeLabel::setSelected(bool s) { - QCanvasRectangle::setSelected(s); + TQCanvasRectangle::setSelected(s); StoredDrawParams::setSelected(s); update(); } -const QString&GraphTreeLabel::source()const +const TQString&GraphTreeLabel::source()const { return m_SourceNode; } -void GraphTreeLabel::setSource(const QString&_s) +void GraphTreeLabel::setSource(const TQString&_s) { m_SourceNode=_s; } -GraphEdge::GraphEdge(QCanvas*c) - : QCanvasSpline(c) +GraphEdge::GraphEdge(TQCanvas*c) + : TQCanvasSpline(c) { } @@ -89,12 +89,12 @@ GraphEdge::~GraphEdge() { } -void GraphEdge::drawShape(QPainter& p) +void GraphEdge::drawShape(TQPainter& p) { p.drawPolyline(poly); } -QPointArray GraphEdge::areaPoints() const +TQPointArray GraphEdge::areaPoints() const { int minX = poly[0].x(), minY = poly[0].y(); int maxX = minX, maxY = minY; @@ -109,7 +109,7 @@ QPointArray GraphEdge::areaPoints() const if (poly[i].y() > maxY) maxY = poly[i].y(); if (0) qDebug(" P %d: %d/%d", i, poly[i].x(), poly[i].y()); } - QPointArray a = poly.copy(), b = poly.copy(); + TQPointArray a = poly.copy(), b = poly.copy(); if (minX == maxX) { a.translate(-2, 0); b.translate(2, 0); @@ -137,14 +137,14 @@ int GraphEdge::rtti()const return GRAPHTREE_LINE; } -GraphEdgeArrow::GraphEdgeArrow(GraphEdge*_parent,QCanvas*c) - : QCanvasPolygon(c),_edge(_parent) +GraphEdgeArrow::GraphEdgeArrow(GraphEdge*_tqparent,TQCanvas*c) + : TQCanvasPolygon(c),_edge(_tqparent) { } -void GraphEdgeArrow::drawShape(QPainter&p) +void GraphEdgeArrow::drawShape(TQPainter&p) { - QCanvasPolygon::drawShape(p); + TQCanvasPolygon::drawShape(p); } int GraphEdgeArrow::rtti()const @@ -158,10 +158,10 @@ GraphEdge*GraphEdgeArrow::edge() } /* taken from KCacheGrind project */ -QPixmap*GraphMark::_p=0; +TQPixmap*GraphMark::_p=0; -GraphMark::GraphMark(GraphTreeLabel*n,QCanvas*c) - : QCanvasRectangle(c) +GraphMark::GraphMark(GraphTreeLabel*n,TQCanvas*c) + : TQCanvasRectangle(c) { if (!_p) { @@ -169,27 +169,27 @@ GraphMark::GraphMark(GraphTreeLabel*n,QCanvas*c) float v1 = 130.0, v2 = 10.0, v = v1, f = 1.03; // calculate pix size - QRect r(0, 0, 30, 30); + TQRect r(0, 0, 30, 30); while (v>v2) { r.setRect(r.x()-d, r.y()-d, r.width()+2*d, r.height()+2*d); v /= f; } - _p = new QPixmap(r.size()); - _p->fill(Qt::white); - QPainter p(_p); - p.setPen(Qt::NoPen); + _p = new TQPixmap(r.size()); + _p->fill(TQt::white); + TQPainter p(_p); + p.setPen(TQt::NoPen); r.moveBy(-r.x(), -r.y()); while (v +#include /** @author Rajko Albrecht */ -class GraphTreeLabel : public QCanvasRectangle,StoredDrawParams +class GraphTreeLabel : public TQCanvasRectangle,StoredDrawParams { public: - GraphTreeLabel(const QString&,const QString&,const QRect&r,QCanvas*c); + GraphTreeLabel(const TQString&,const TQString&,const TQRect&r,TQCanvas*c); virtual ~GraphTreeLabel(); virtual int rtti()const; - virtual void drawShape(QPainter& p); + virtual void drawShape(TQPainter& p); - void setBgColor(const QColor&); + void setBgColor(const TQColor&); - const QString&nodename()const; - const QString&source()const; - void setSource(const QString&); + const TQString&nodename()const; + const TQString&source()const; + void setSource(const TQString&); virtual void setSelected(bool); protected: - QString m_Nodename; - QString m_SourceNode; + TQString m_Nodename; + TQString m_SourceNode; }; class GraphEdge; -class GraphEdgeArrow:public QCanvasPolygon +class GraphEdgeArrow:public TQCanvasPolygon { public: - GraphEdgeArrow(GraphEdge*,QCanvas*); + GraphEdgeArrow(GraphEdge*,TQCanvas*); GraphEdge*edge(); - virtual void drawShape(QPainter&); + virtual void drawShape(TQPainter&); virtual int rtti()const; private: @@ -62,28 +62,28 @@ private: }; /* line */ -class GraphEdge:public QCanvasSpline +class GraphEdge:public TQCanvasSpline { public: - GraphEdge(QCanvas*); + GraphEdge(TQCanvas*); virtual ~GraphEdge(); - virtual void drawShape(QPainter&); - QPointArray areaPoints() const; + virtual void drawShape(TQPainter&); + TQPointArray areaPoints() const; virtual int rtti()const; }; -class GraphMark:public QCanvasRectangle +class GraphMark:public TQCanvasRectangle { public: - GraphMark(GraphTreeLabel*,QCanvas*); + GraphMark(GraphTreeLabel*,TQCanvas*); virtual ~GraphMark(); virtual int rtti()const; - virtual bool hit(const QPoint&)const; + virtual bool hit(const TQPoint&)const; - virtual void drawShape(QPainter&); + virtual void drawShape(TQPainter&); private: - static QPixmap*_p; + static TQPixmap*_p; }; #endif diff --git a/src/svnfrontend/graphtree/pannerview.cpp b/src/svnfrontend/graphtree/pannerview.cpp index 5f14e82..c3a2586 100644 --- a/src/svnfrontend/graphtree/pannerview.cpp +++ b/src/svnfrontend/graphtree/pannerview.cpp @@ -18,46 +18,46 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "pannerview.h" -#include +#include -PannerView::PannerView(QWidget* parent, const char* name) - : QCanvasView(parent, name,WNoAutoErase | WStaticContents ) +PannerView::PannerView(TQWidget* tqparent, const char* name) + : TQCanvasView(tqparent, name,WNoAutoErase | WStaticContents ) { m_Moving = false; - viewport()->setBackgroundMode(Qt::NoBackground); - setBackgroundMode(Qt::NoBackground); + viewport()->setBackgroundMode(TQt::NoBackground); + setBackgroundMode(TQt::NoBackground); } PannerView::~PannerView() { } -void PannerView::drawContents(QPainter* p, int clipx, int clipy, int clipw, int cliph) +void PannerView::drawContents(TQPainter* p, int clipx, int clipy, int clipw, int cliph) { p->save(); - QCanvasView::drawContents(p,clipx,clipy,clipw,cliph); + TQCanvasView::drawContents(p,clipx,clipy,clipw,cliph); p->restore(); if (m_ZoomRect.isValid()) { p->setPen(red.dark()); p->drawRect(m_ZoomRect); p->setPen( red); - p->drawRect(QRect(m_ZoomRect.x()+1, m_ZoomRect.y()+1, + p->drawRect(TQRect(m_ZoomRect.x()+1, m_ZoomRect.y()+1, m_ZoomRect.width()-2, m_ZoomRect.height()-2)); } } -void PannerView::setZoomRect(const QRect& theValue) +void PannerView::setZoomRect(const TQRect& theValue) { - QRect oldRect = m_ZoomRect; + TQRect oldRect = m_ZoomRect; m_ZoomRect = theValue; updateContents(oldRect); updateContents(m_ZoomRect); } /*! - \fn PannerView::contentsMouseMoveEvent(QMouseEvent* e) + \fn PannerView::contentsMouseMoveEvent(TQMouseEvent* e) */ -void PannerView::contentsMouseMoveEvent(QMouseEvent* e) +void PannerView::contentsMouseMoveEvent(TQMouseEvent* e) { if (m_Moving) { emit zoomRectMoved(e->pos().x() - m_LastPos.x(), e->pos().y() - m_LastPos.y()); @@ -66,12 +66,12 @@ void PannerView::contentsMouseMoveEvent(QMouseEvent* e) } /*! - \fn PannerView::contentsMousePressEvent(QMouseEvent* e) + \fn PannerView::contentsMousePressEvent(TQMouseEvent* e) */ -void PannerView::contentsMousePressEvent(QMouseEvent* e) +void PannerView::contentsMousePressEvent(TQMouseEvent* e) { if (m_ZoomRect.isValid()) { - if (!m_ZoomRect.contains(e->pos())) { + if (!m_ZoomRect.tqcontains(e->pos())) { emit zoomRectMoved(e->pos().x() - m_ZoomRect.center().x(), e->pos().y() - m_ZoomRect.center().y()); } @@ -81,9 +81,9 @@ void PannerView::contentsMousePressEvent(QMouseEvent* e) } /*! - \fn PannerView::contentsMouseReleaseEvent(QMouseEvent*) + \fn PannerView::contentsMouseReleaseEvent(TQMouseEvent*) */ -void PannerView::contentsMouseReleaseEvent(QMouseEvent*) +void PannerView::contentsMouseReleaseEvent(TQMouseEvent*) { m_Moving = false; emit zoomRectMoveFinished(); diff --git a/src/svnfrontend/graphtree/pannerview.h b/src/svnfrontend/graphtree/pannerview.h index 6c1a310..026488d 100644 --- a/src/svnfrontend/graphtree/pannerview.h +++ b/src/svnfrontend/graphtree/pannerview.h @@ -20,19 +20,20 @@ #ifndef PANNERVIEW_H #define PANNERVIEW_H -#include +#include /** @author Rajko Albrecht */ -class PannerView : public QCanvasView +class PannerView : public TQCanvasView { Q_OBJECT + TQ_OBJECT public: - PannerView(QWidget* parent=0, const char* name=0); + PannerView(TQWidget* tqparent=0, const char* name=0); virtual ~PannerView(); - void setZoomRect(const QRect& theValue); + void setZoomRect(const TQRect& theValue); void updateCurrentRect(); signals: @@ -40,14 +41,14 @@ signals: void zoomRectMoveFinished(); protected: - virtual void drawContents(QPainter* p, int clipx, int clipy, int clipw, int cliph); - virtual void contentsMouseMoveEvent(QMouseEvent* e); - virtual void contentsMousePressEvent(QMouseEvent* e); - virtual void contentsMouseReleaseEvent(QMouseEvent*); + virtual void drawContents(TQPainter* p, int clipx, int clipy, int clipw, int cliph); + virtual void contentsMouseMoveEvent(TQMouseEvent* e); + virtual void contentsMousePressEvent(TQMouseEvent* e); + virtual void contentsMouseReleaseEvent(TQMouseEvent*); protected: - QRect m_ZoomRect; + TQRect m_ZoomRect; bool m_Moving; - QPoint m_LastPos; + TQPoint m_LastPos; }; #endif diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp index cc85c0e..afb9d3a 100644 --- a/src/svnfrontend/graphtree/revgraphview.cpp +++ b/src/svnfrontend/graphtree/revgraphview.cpp @@ -34,11 +34,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -46,38 +46,38 @@ #define LABEL_HEIGHT 90 -class GraphViewTip:public QToolTip +class GraphViewTip:public TQToolTip { public: - GraphViewTip( QWidget* p ):QToolTip(p) {} + GraphViewTip( TQWidget* p ):TQToolTip(p) {} virtual ~GraphViewTip(){} protected: - void maybeTip( const QPoint & ); + void maybeTip( const TQPoint & ); }; -void GraphViewTip::maybeTip( const QPoint & pos) +void GraphViewTip::maybeTip( const TQPoint & pos) { - if (!parentWidget()->inherits( "RevGraphView" )) return; - RevGraphView* cgv = (RevGraphView*)parentWidget(); - QPoint cPos = cgv->viewportToContents(pos); - QCanvasItemList l = cgv->canvas()->collisions(cPos); + if (!tqparentWidget()->inherits( "RevGraphView" )) return; + RevGraphView* cgv = (RevGraphView*)tqparentWidget(); + TQPoint cPos = cgv->viewportToContents(pos); + TQCanvasItemList l = cgv->canvas()->collisions(cPos); if (l.count() == 0) return; - QCanvasItem* i = l.first(); + TQCanvasItem* i = l.first(); if (i->rtti() == GRAPHTREE_LABEL) { GraphTreeLabel*tl = (GraphTreeLabel*)i; - QString nm = tl->nodename(); - QString tipStr = cgv->toolTip(nm); + TQString nm = tl->nodename(); + TQString tipStr = cgv->toolTip(nm); if (tipStr.length()>0) { - QPoint vPosTL = cgv->contentsToViewport(i->boundingRect().topLeft()); - QPoint vPosBR = cgv->contentsToViewport(i->boundingRect().bottomRight()); - tip(QRect(vPosTL, vPosBR), tipStr); + TQPoint vPosTL = cgv->contentsToViewport(i->boundingRect().topLeft()); + TQPoint vPosBR = cgv->contentsToViewport(i->boundingRect().bottomRight()); + tip(TQRect(vPosTL, vPosBR), tipStr); } } } -RevGraphView::RevGraphView(QObject*aListener,svn::Client*_client,QWidget * parent, const char * name, WFlags f) - : QCanvasView(parent,name,f) +RevGraphView::RevGraphView(TQObject*aListener,svn::Client*_client,TQWidget * tqparent, const char * name, WFlags f) + : TQCanvasView(tqparent,name,f) { m_Canvas = 0L; m_Client = _client; @@ -88,16 +88,16 @@ RevGraphView::RevGraphView(QObject*aListener,svn::Client*_client,QWidget * paren m_Marker = 0; m_Tip = new GraphViewTip(this); m_CompleteView = new PannerView(this); - m_CompleteView->setVScrollBarMode(QScrollView::AlwaysOff); - m_CompleteView->setHScrollBarMode(QScrollView::AlwaysOff); + m_CompleteView->setVScrollBarMode(TQScrollView::AlwaysOff); + m_CompleteView->setHScrollBarMode(TQScrollView::AlwaysOff); m_CompleteView->raise(); m_CompleteView->hide(); - connect(this, SIGNAL(contentsMoving(int,int)), - this, SLOT(contentsMovingSlot(int,int))); - connect(m_CompleteView, SIGNAL(zoomRectMoved(int,int)), - this, SLOT(zoomRectMoved(int,int))); - connect(m_CompleteView, SIGNAL(zoomRectMoveFinished()), - this, SLOT(zoomRectMoveFinished())); + connect(this, TQT_SIGNAL(contentsMoving(int,int)), + this, TQT_SLOT(contentsMovingSlot(int,int))); + connect(m_CompleteView, TQT_SIGNAL(zoomRectMoved(int,int)), + this, TQT_SLOT(zoomRectMoved(int,int))); + connect(m_CompleteView, TQT_SIGNAL(zoomRectMoveFinished()), + this, TQT_SLOT(zoomRectMoveFinished())); m_LastAutoPosition = TopLeft; _isMoving = false; _noUpdateZoomerPos = false; @@ -114,13 +114,13 @@ RevGraphView::~RevGraphView() delete renderProcess; } -void RevGraphView::showText(const QString&s) +void RevGraphView::showText(const TQString&s) { clear(); - m_Canvas = new QCanvas(QApplication::desktop()->width(), - QApplication::desktop()->height()); + m_Canvas = new TQCanvas(TQApplication::desktop()->width(), + TQApplication::desktop()->height()); - QCanvasText* t = new QCanvasText(s, m_Canvas); + TQCanvasText* t = new TQCanvasText(s, m_Canvas); t->move(5, 5); t->show(); center(0,0); @@ -164,20 +164,20 @@ void RevGraphView::endInsert() void RevGraphView::readDotOutput(KProcess*,char * buffer,int buflen) { - dotOutput+=QString::fromLocal8Bit(buffer, buflen); + dotOutput+=TQString::fromLocal8Bit(buffer, buflen); } void RevGraphView::dotExit(KProcess*p) { if (p!=renderProcess)return; // remove line breaks when lines to long - QRegExp endslash("\\\\\\n"); - dotOutput.replace(endslash,""); + TQRegExp endslash("\\\\\\n"); + dotOutput.tqreplace(endslash,""); double scale = 1.0, scaleX = 1.0, scaleY = 1.0; double dotWidth, dotHeight; - QTextStream* dotStream; - dotStream = new QTextStream(dotOutput, IO_ReadOnly); - QString line,cmd; + TQTextStream* dotStream; + dotStream = new TQTextStream(dotOutput, IO_ReadOnly); + TQString line,cmd; int lineno=0; clear(); beginInsert(); @@ -187,7 +187,7 @@ void RevGraphView::dotExit(KProcess*p) if (line.isNull()) break; lineno++; if (line.isEmpty()) continue; - QTextStream lineStream(line, IO_ReadOnly); + TQTextStream lineStream(line, IO_ReadOnly); lineStream >> cmd; if (cmd == "stop") {break; } @@ -198,12 +198,12 @@ void RevGraphView::dotExit(KProcess*p) int h = (int)(scaleY * dotHeight); _xMargin = 50; - if (w < QApplication::desktop()->width()) - _xMargin += (QApplication::desktop()->width()-w)/2; + if (w < TQApplication::desktop()->width()) + _xMargin += (TQApplication::desktop()->width()-w)/2; _yMargin = 50; - if (h < QApplication::desktop()->height()) - _yMargin += (QApplication::desktop()->height()-h)/2; - m_Canvas = new QCanvas(int(w+2*_xMargin), int(h+2*_yMargin)); + if (h < TQApplication::desktop()->height()) + _yMargin += (TQApplication::desktop()->height()-h)/2; + m_Canvas = new TQCanvas(int(w+2*_xMargin), int(h+2*_yMargin)); continue; } if ((cmd != "node") && (cmd != "edge")) { @@ -212,8 +212,8 @@ void RevGraphView::dotExit(KProcess*p) continue; } if (cmd=="node") { - QString nodeName, label; - QString _x,_y,_w,_h; + TQString nodeName, label; + TQString _x,_y,_w,_h; double x, y, width, height; lineStream >> nodeName >> _x >> _y >> _w >> _h; x=_x.toDouble(); @@ -227,7 +227,7 @@ void RevGraphView::dotExit(KProcess*p) int yy = (int)(scaleY * (dotHeight - y) + _yMargin); int w = (int)(scaleX * width); int h = (int)(scaleY * height); - QRect r(xx-w/2, yy-h/2, w, h); + TQRect r(xx-w/2, yy-h/2, w, h); GraphTreeLabel*t=new GraphTreeLabel(label,nodeName,r,m_Canvas); if (isStart(nodeName)) { ensureVisible(r.x(),r.y()); @@ -237,10 +237,10 @@ void RevGraphView::dotExit(KProcess*p) t->show(); m_NodeList[nodeName]=t; } else { - QString node1Name, node2Name, label; - QString _x,_y; + TQString node1Name, node2Name, label; + TQString _x,_y; double x, y; - QPointArray pa; + TQPointArray pa; int points, i; lineStream >> node1Name >> node2Name; lineStream >> points; @@ -264,26 +264,26 @@ void RevGraphView::dotExit(KProcess*p) } GraphEdge * n = new GraphEdge(m_Canvas); - QColor arrowColor = Qt::black; - n->setPen(QPen(arrowColor,1)); + TQColor arrowColor = TQt::black; + n->setPen(TQPen(arrowColor,1)); n->setControlPoints(pa,false); n->setZ(0.5); n->show(); /* arrow */ - QPoint arrowDir; + TQPoint arrowDir; int indexHead = -1; - QMap::Iterator it; - it = m_NodeList.find(node2Name); + TQMap::Iterator it; + it = m_NodeList.tqfind(node2Name); if (it!=m_NodeList.end()) { it.data()->setSource(node1Name); } - it = m_NodeList.find(node1Name); + it = m_NodeList.tqfind(node1Name); if (it!=m_NodeList.end()) { GraphTreeLabel*tlab = it.data(); if (tlab) { - QPoint toCenter = tlab->rect().center(); + TQPoint toCenter = tlab->rect().center(); int dx0 = pa.point(0).x() - toCenter.x(); int dy0 = pa.point(0).y() - toCenter.y(); int dx1 = pa.point(points-1).x() - toCenter.x(); @@ -310,11 +310,11 @@ void RevGraphView::dotExit(KProcess*p) if (!arrowDir.isNull()) { arrowDir *= 10.0/sqrt(double(arrowDir.x()*arrowDir.x() + arrowDir.y()*arrowDir.y())); - QPointArray a(3); + TQPointArray a(3); a.setPoint(0, pa.point(indexHead) + arrowDir); - a.setPoint(1, pa.point(indexHead) + QPoint(arrowDir.y()/2, + a.setPoint(1, pa.point(indexHead) + TQPoint(arrowDir.y()/2, -arrowDir.x()/2)); - a.setPoint(2, pa.point(indexHead) + QPoint(-arrowDir.y()/2, + a.setPoint(2, pa.point(indexHead) + TQPoint(-arrowDir.y()/2, arrowDir.x()/2)); GraphEdgeArrow* aItem = new GraphEdgeArrow(n,m_Canvas); aItem->setPoints(a); @@ -326,7 +326,7 @@ void RevGraphView::dotExit(KProcess*p) } } if (!m_Canvas) { - QString s = i18n("Error running the graph layouting tool.\n"); + TQString s = i18n("Error running the graph tqlayouting tool.\n"); s += i18n("Please check that 'dot' is installed (package GraphViz)."); showText(s); } else { @@ -338,11 +338,11 @@ void RevGraphView::dotExit(KProcess*p) renderProcess=0; } -bool RevGraphView::isStart(const QString&nodeName)const +bool RevGraphView::isStart(const TQString&nodeName)const { bool res = false; trevTree::ConstIterator it; - it = m_Tree.find(nodeName); + it = m_Tree.tqfind(nodeName); if (it==m_Tree.end()) { return res; } @@ -354,21 +354,21 @@ bool RevGraphView::isStart(const QString&nodeName)const return res; } -char RevGraphView::getAction(const QString&nodeName)const +char RevGraphView::getAction(const TQString&nodeName)const { trevTree::ConstIterator it; - it = m_Tree.find(nodeName); + it = m_Tree.tqfind(nodeName); if (it==m_Tree.end()) { return (char)0; } return it.data().Action; } -QColor RevGraphView::getBgColor(const QString&nodeName)const +TQColor RevGraphView::getBgColor(const TQString&nodeName)const { trevTree::ConstIterator it; - it = m_Tree.find(nodeName); - QColor res = Qt::white; + it = m_Tree.tqfind(nodeName); + TQColor res = TQt::white; if (it==m_Tree.end()) { return res; } @@ -397,43 +397,43 @@ QColor RevGraphView::getBgColor(const QString&nodeName)const return res; } -const QString&RevGraphView::getLabelstring(const QString&nodeName) +const TQString&RevGraphView::getLabelstring(const TQString&nodeName) { - QMap::ConstIterator nIt; - nIt = m_LabelMap.find(nodeName); + TQMap::ConstIterator nIt; + nIt = m_LabelMap.tqfind(nodeName); if (nIt!=m_LabelMap.end()) { return nIt.data(); } trevTree::ConstIterator it1; - it1 = m_Tree.find(nodeName); + it1 = m_Tree.tqfind(nodeName); if (it1==m_Tree.end()) { return m_LabelMap[""]; } - QString res; + TQString res; switch (it1.data().Action) { case 'D': - res = i18n("Deleted at revision %1").arg(it1.data().rev); + res = i18n("Deleted at revision %1").tqarg(it1.data().rev); break; case 'A': res = i18n("Added at revision %1 as %2") - .arg(it1.data().rev) - .arg(it1.data().name); + .tqarg(it1.data().rev) + .tqarg(it1.data().name); break; case 'C': case 1: - res = i18n("Copied to %1 at revision %2").arg(it1.data().name).arg(it1.data().rev); + res = i18n("Copied to %1 at revision %2").tqarg(it1.data().name).tqarg(it1.data().rev); break; case 2: - res = i18n("Renamed to %1 at revision %2").arg(it1.data().name).arg(it1.data().rev); + res = i18n("Renamed to %1 at revision %2").tqarg(it1.data().name).tqarg(it1.data().rev); break; case 'M': - res = i18n("Modified at revision %1").arg(it1.data().rev); + res = i18n("Modified at revision %1").tqarg(it1.data().rev); break; case 'R': - res = i18n("Replaced at revision %1").arg(it1.data().rev); + res = i18n("Replaced at revision %1").tqarg(it1.data().rev); break; default: - res=i18n("Revision %1").arg(it1.data().rev); + res=i18n("Revision %1").tqarg(it1.data().rev); break; } m_LabelMap[nodeName]=res; @@ -445,19 +445,19 @@ void RevGraphView::dumpRevtree() delete dotTmpFile; clear(); dotOutput = ""; - dotTmpFile = new KTempFile(QString::null,".dot"); + dotTmpFile = new KTempFile(TQString(),".dot"); dotTmpFile->setAutoDelete(true); - QTextStream* stream = dotTmpFile->textStream(); + TQTextStream* stream = dotTmpFile->textStream(); if (!stream) { - showText(i18n("Could not open tempfile %1 for writing.").arg(dotTmpFile->name())); + showText(i18n("Could not open tempfile %1 for writing.").tqarg(dotTmpFile->name())); return; } *stream << "digraph \"callgraph\" {\n"; *stream << " bgcolor=\"transparent\";\n"; int dir = Kdesvnsettings::tree_direction(); - *stream << QString(" rankdir=\""); + *stream << TQString(" rankdir=\""); switch (dir) { case 3: *stream << "TB"; @@ -475,13 +475,13 @@ void RevGraphView::dumpRevtree() } *stream << "\";\n"; - //*stream << QString(" overlap=false;\n splines=true;\n"); + //*stream << TQString(" overlap=false;\n splines=true;\n"); RevGraphView::trevTree::ConstIterator it1; for (it1=m_Tree.begin();it1!=m_Tree.end();++it1) { *stream << " " << it1.key() << "[ " - << "shape=box, " + << "tqshape=box, " << "label=\""<setEnvironment("LANG","C"); *renderProcess << "dot"; *renderProcess << dotTmpFile->name() << "-Tplain"; - connect(renderProcess,SIGNAL(processExited(KProcess*)),this,SLOT(dotExit(KProcess*))); - connect(renderProcess,SIGNAL(receivedStdout(KProcess*,char*,int)), - this,SLOT(readDotOutput(KProcess*,char*,int)) ); + connect(renderProcess,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(dotExit(KProcess*))); + connect(renderProcess,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), + this,TQT_SLOT(readDotOutput(KProcess*,char*,int)) ); if (!renderProcess->start(KProcess::NotifyOnExit,KProcess::Stdout)) { - QString arguments; + TQString arguments; for (unsigned c=0;cargs().count();++c) { - arguments+=QString(" %1").arg(renderProcess->args()[c]); + arguments+=TQString(" %1").tqarg(renderProcess->args()[c].data()); } - QString error = i18n("Could not start process \"%1\".").arg(arguments); + TQString error = i18n("Could not start process \"%1\".").tqarg(arguments); showText(error); renderProcess=0; //delete renderProcess;< } } -QString RevGraphView::toolTip(const QString&_nodename,bool full)const +TQString RevGraphView::toolTip(const TQString&_nodename,bool full)const { - QString res = QString::null; + TQString res = TQString(); trevTree::ConstIterator it; - it = m_Tree.find(_nodename); + it = m_Tree.tqfind(_nodename); if (it==m_Tree.end()) { return res; } - QStringList sp = QStringList::split("\n",it.data().Message); - QString sm; + TQStringList sp = TQStringList::split("\n",it.data().Message); + TQString sm; if (sp.count()==0) { sm = it.data().Message; } else { @@ -536,34 +536,34 @@ QString RevGraphView::toolTip(const QString&_nodename,bool full)const sm.truncate(47); sm+="..."; } - static QString csep = ""; - static QString rend = ""; - static QString rstart = ""; - res = QString(""); + static TQString csep = ""; + static TQString rend = ""; + static TQString rstart = ""; + res = TQString(""); if (!full) { - res+=QString("%1").arg(it.data().name); + res+=TQString("%1").tqarg(it.data().name); res += i18n("
Revision: %1
Author: %2
Date: %3
Log: %4") - .arg(it.data().rev) - .arg(it.data().Author) - .arg(it.data().Date) - .arg(sm); + .tqarg(it.data().rev) + .tqarg(it.data().Author) + .tqarg(it.data().Date) + .tqarg(sm); } else { res+=""; res+=rstart; - res+=i18n("Revision%1%2%3").arg(csep).arg(it.data().rev).arg(rend); - res+=rstart+i18n("Author%1%2%3").arg(csep).arg(it.data().Author).arg(rend); - res+=rstart+i18n("Date%1%2%3").arg(csep).arg(it.data().Date).arg(rend); - res+=rstart+i18n("Log%1%2%3").arg(csep).arg(sm).arg(rend); + res+=i18n("Revision%1%2%3").tqarg(csep).tqarg(it.data().rev).tqarg(rend); + res+=rstart+i18n("Author%1%2%3").tqarg(csep).tqarg(it.data().Author).tqarg(rend); + res+=rstart+i18n("Date%1%2%3").tqarg(csep).tqarg(it.data().Date).tqarg(rend); + res+=rstart+i18n("Log%1%2%3").tqarg(csep).tqarg(sm).tqarg(rend); res+="
"+it.data().name+"
"; } return res; } -void RevGraphView::updateSizes(QSize s) +void RevGraphView::updateSizes(TQSize s) { if (!m_Canvas) return; - if (s == QSize(0,0)) s = size(); + if (s == TQSize(0,0)) s = size(); // the part of the canvas that should be visible int cWidth = m_Canvas->width() - 2*_xMargin + 100; @@ -597,7 +597,7 @@ void RevGraphView::updateSizes(QSize s) m_Canvas->width(), m_Canvas->height(), cWidth, cHeight, zoom); - QWMatrix wm; + TQWMatrix wm; wm.scale( zoom, zoom ); m_CompleteView->setWorldMatrix(wm); @@ -621,8 +621,8 @@ void RevGraphView::updateZoomerPos() int x = width()- cvW - verticalScrollBar()->width() -2; int y = height()-cvH - horizontalScrollBar()->height() -2; - QPoint oldZoomPos = m_CompleteView->pos(); - QPoint newZoomPos = QPoint(0,0); + TQPoint oldZoomPos = m_CompleteView->pos(); + TQPoint newZoomPos = TQPoint(0,0); #if 0 ZoomPosition zp = _zoomPosition; @@ -630,18 +630,18 @@ void RevGraphView::updateZoomerPos() #else ZoomPosition zp = m_LastAutoPosition; #endif - QPoint tl1Pos = viewportToContents(QPoint(0,0)); - QPoint tl2Pos = viewportToContents(QPoint(cvW,cvH)); - QPoint tr1Pos = viewportToContents(QPoint(x,0)); - QPoint tr2Pos = viewportToContents(QPoint(x+cvW,cvH)); - QPoint bl1Pos = viewportToContents(QPoint(0,y)); - QPoint bl2Pos = viewportToContents(QPoint(cvW,y+cvH)); - QPoint br1Pos = viewportToContents(QPoint(x,y)); - QPoint br2Pos = viewportToContents(QPoint(x+cvW,y+cvH)); - int tlCols = m_Canvas->collisions(QRect(tl1Pos,tl2Pos)).count(); - int trCols = m_Canvas->collisions(QRect(tr1Pos,tr2Pos)).count(); - int blCols = m_Canvas->collisions(QRect(bl1Pos,bl2Pos)).count(); - int brCols = m_Canvas->collisions(QRect(br1Pos,br2Pos)).count(); + TQPoint tl1Pos = viewportToContents(TQPoint(0,0)); + TQPoint tl2Pos = viewportToContents(TQPoint(cvW,cvH)); + TQPoint tr1Pos = viewportToContents(TQPoint(x,0)); + TQPoint tr2Pos = viewportToContents(TQPoint(x+cvW,cvH)); + TQPoint bl1Pos = viewportToContents(TQPoint(0,y)); + TQPoint bl2Pos = viewportToContents(TQPoint(cvW,y+cvH)); + TQPoint br1Pos = viewportToContents(TQPoint(x,y)); + TQPoint br2Pos = viewportToContents(TQPoint(x+cvW,y+cvH)); + int tlCols = m_Canvas->collisions(TQRect(tl1Pos,tl2Pos)).count(); + int trCols = m_Canvas->collisions(TQRect(tr1Pos,tr2Pos)).count(); + int blCols = m_Canvas->collisions(TQRect(bl1Pos,bl2Pos)).count(); + int brCols = m_Canvas->collisions(TQRect(br1Pos,br2Pos)).count(); int minCols = tlCols; zp = m_LastAutoPosition; switch(zp) { @@ -662,13 +662,13 @@ void RevGraphView::updateZoomerPos() #endif switch(zp) { case TopRight: - newZoomPos = QPoint(x,0); + newZoomPos = TQPoint(x,0); break; case BottomLeft: - newZoomPos = QPoint(0,y); + newZoomPos = TQPoint(0,y); break; case BottomRight: - newZoomPos = QPoint(x,y); + newZoomPos = TQPoint(x,y); break; default: break; @@ -678,7 +678,7 @@ void RevGraphView::updateZoomerPos() void RevGraphView::contentsMovingSlot(int x,int y) { - QRect z(int(x * _cvZoom), int(y * _cvZoom), + TQRect z(int(x * _cvZoom), int(y * _cvZoom), int(visibleWidth() * _cvZoom)-1, int(visibleHeight() * _cvZoom)-1); if (0) qDebug("moving: (%d,%d) => (%d/%d - %dx%d)", x, y, z.x(), z.y(), z.width(), z.height()); @@ -705,9 +705,9 @@ void RevGraphView::zoomRectMoveFinished() updateZoomerPos(); } -void RevGraphView::resizeEvent(QResizeEvent*e) +void RevGraphView::resizeEvent(TQResizeEvent*e) { - QCanvasView::resizeEvent(e); + TQCanvasView::resizeEvent(e); if (m_Canvas) updateSizes(e->size()); } @@ -732,13 +732,13 @@ void RevGraphView::makeSelected(GraphTreeLabel*gtl) m_CompleteView->updateCurrentRect(); } -void RevGraphView::contentsMouseDoubleClickEvent ( QMouseEvent * e ) +void RevGraphView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) { setFocus(); if (e->button() == Qt::LeftButton) { - QCanvasItemList l = canvas()->collisions(e->pos()); + TQCanvasItemList l = canvas()->collisions(e->pos()); if (l.count()>0) { - QCanvasItem* i = l.first(); + TQCanvasItem* i = l.first(); if (i->rtti()==GRAPHTREE_LABEL) { makeSelected( (GraphTreeLabel*)i); emit dispDetails(toolTip(((GraphTreeLabel*)i)->nodename(),true)); @@ -747,20 +747,20 @@ void RevGraphView::contentsMouseDoubleClickEvent ( QMouseEvent * e ) } } -void RevGraphView::contentsMousePressEvent ( QMouseEvent * e ) +void RevGraphView::contentsMousePressEvent ( TQMouseEvent * e ) { setFocus(); _isMoving = true; _lastPos = e->globalPos(); } -void RevGraphView::contentsMouseReleaseEvent ( QMouseEvent * ) +void RevGraphView::contentsMouseReleaseEvent ( TQMouseEvent * ) { _isMoving = false; updateZoomerPos(); } -void RevGraphView::contentsMouseMoveEvent ( QMouseEvent * e ) +void RevGraphView::contentsMouseMoveEvent ( TQMouseEvent * e ) { if (_isMoving) { int dx = e->globalPos().x() - _lastPos.x(); @@ -780,13 +780,13 @@ void RevGraphView::setNewDirection(int dir) dumpRevtree(); } -void RevGraphView::contentsContextMenuEvent(QContextMenuEvent* e) +void RevGraphView::contentsContextMenuEvent(TQContextMenuEvent* e) { if (!m_Canvas) return; - QCanvasItemList l = canvas()->collisions(e->pos()); - QCanvasItem* i = (l.count() == 0) ? 0 : l.first(); + TQCanvasItemList l = canvas()->collisions(e->pos()); + TQCanvasItem* i = (l.count() == 0) ? 0 : l.first(); - QPopupMenu popup; + TQPopupMenu popup; if (i && i->rtti()==GRAPHTREE_LABEL) { if (!((GraphTreeLabel*)i)->source().isEmpty() && getAction(((GraphTreeLabel*)i)->nodename())!='D') { popup.insertItem(i18n("Diff to previous"),301); @@ -832,7 +832,7 @@ void RevGraphView::contentsContextMenuEvent(QContextMenuEvent* e) break; case 201: { - QString fn = KFileDialog::getSaveFileName(":","*.png"); + TQString fn = KFileDialog::getSaveFileName(":","*.png"); if (!fn.isEmpty()) { if (m_Marker) { m_Marker->hide(); @@ -840,8 +840,8 @@ void RevGraphView::contentsContextMenuEvent(QContextMenuEvent* e) if (m_Selected) { m_Selected->setSelected(false); } - QPixmap pix(m_Canvas->size()); - QPainter p(&pix); + TQPixmap pix(m_Canvas->size()); + TQPainter p(&pix); m_Canvas->drawArea( m_Canvas->rect(), &p ); pix.save(fn,"PNG"); if (m_Marker) { @@ -894,57 +894,57 @@ void RevGraphView::makeCat(GraphTreeLabel*_l) if (!_l) { return; } - QString n1 = _l->nodename(); - trevTree::ConstIterator it = m_Tree.find(n1); + TQString n1 = _l->nodename(); + trevTree::ConstIterator it = m_Tree.tqfind(n1); if (it==m_Tree.end()) { return; } svn::Revision tr(it.data().rev); - QString tp = _basePath+it.data().name; - emit makeCat(tr,tp,it.data().name,tr,kapp->activeModalWidget()); + TQString tp = _basePath+it.data().name; + emit makeCat(tr,tp,it.data().name,tr,TQT_TQWIDGET(kapp->activeModalWidget())); } void RevGraphView::makeDiffPrev(GraphTreeLabel*_l) { if (!_l) return; - QString n1,n2; + TQString n1,n2; n1 = _l->nodename(); n2 = _l->source(); makeDiff(n1,n2); } -void RevGraphView::makeDiff(const QString&n1,const QString&n2) +void RevGraphView::makeDiff(const TQString&n1,const TQString&n2) { if (n1.isEmpty()||n2.isEmpty()) return; trevTree::ConstIterator it; - it = m_Tree.find(n2); + it = m_Tree.tqfind(n2); if (it==m_Tree.end()) { return; } svn::Revision sr(it.data().rev); - QString sp = _basePath+it.data().name; + TQString sp = _basePath+it.data().name; - it = m_Tree.find(n1); + it = m_Tree.tqfind(n1); if (it==m_Tree.end()) { return; } svn::Revision tr(it.data().rev); - QString tp = _basePath+it.data().name; + TQString tp = _basePath+it.data().name; if (Kdesvnsettings::tree_diff_rec()) { - emit makeRecDiff(sp,sr,tp,tr,kapp->activeModalWidget()); + emit makeRecDiff(sp,sr,tp,tr,TQT_TQWIDGET(kapp->activeModalWidget())); } else { - emit makeNorecDiff(sp,sr,tp,tr,kapp->activeModalWidget()); + emit makeNorecDiff(sp,sr,tp,tr,TQT_TQWIDGET(kapp->activeModalWidget())); } } -void RevGraphView::setBasePath(const QString&_path) +void RevGraphView::setBasePath(const TQString&_path) { _basePath = _path; } -void RevGraphView::slotClientException(const QString&what) +void RevGraphView::slotClientException(const TQString&what) { - KMessageBox::sorry(KApplication::activeModalWidget(),what,i18n("SVN Error")); + KMessageBox::sorry(TQT_TQWIDGET(KApplication::activeModalWidget()),what,i18n("SVN Error")); } #include "revgraphview.moc" diff --git a/src/svnfrontend/graphtree/revgraphview.h b/src/svnfrontend/graphtree/revgraphview.h index 039bc4b..dcfc007 100644 --- a/src/svnfrontend/graphtree/revgraphview.h +++ b/src/svnfrontend/graphtree/revgraphview.h @@ -22,7 +22,7 @@ #include -#include +#include namespace svn { class LogEntry; @@ -41,18 +41,19 @@ class CContextListener; /** @author Rajko Albrecht */ -class RevGraphView : public QCanvasView +class RevGraphView : public TQCanvasView { Q_OBJECT + TQ_OBJECT public: enum ZoomPosition { TopLeft, TopRight, BottomLeft, BottomRight, Auto }; /* avoid large copy operations */ friend class RevisionTree; - RevGraphView(QObject*,svn::Client*,QWidget * parent = 0, const char * name = 0, WFlags f = 0); + RevGraphView(TQObject*,svn::Client*,TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0); virtual ~RevGraphView(); - void showText(const QString&s); + void showText(const TQString&s); void clear(); void beginInsert(); @@ -60,63 +61,63 @@ public: struct targetData { char Action; - QString key; - targetData(const QString&n,char _a) + TQString key; + targetData(const TQString&n,char _a) { key = n; Action = _a; } targetData(){Action=0;key="";} }; - typedef QValueList tlist; + typedef TQValueList tlist; struct keyData { - QString name,Author,Date,Message; + TQString name,Author,Date,Message; long rev; char Action; tlist targets; }; - typedef QMap trevTree; + typedef TQMap trevTree; - QString toolTip(const QString&nodename,bool full=false)const; + TQString toolTip(const TQString&nodename,bool full=false)const; - void setBasePath(const QString&); + void setBasePath(const TQString&); void dumpRevtree(); signals: - void dispDetails(const QString&); - void makeCat(const svn::Revision&,const QString&,const QString&,const svn::Revision&,QWidget*); - void makeNorecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*); - void makeRecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*); + void dispDetails(const TQString&); + void makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*); + void makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*); + void makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*); public slots: virtual void contentsMovingSlot(int,int); virtual void zoomRectMoved(int,int); virtual void zoomRectMoveFinished(); - virtual void slotClientException(const QString&what); + virtual void slotClientException(const TQString&what); protected slots: virtual void readDotOutput(KProcess * proc,char * buffer,int buflen); virtual void dotExit(KProcess*); protected: - QCanvas*m_Canvas; + TQCanvas*m_Canvas; GraphMark*m_Marker; svn::Client*m_Client; GraphTreeLabel*m_Selected; - QObject*m_Listener; + TQObject*m_Listener; KTempFile*dotTmpFile; - QString dotOutput; + TQString dotOutput; KProcess*renderProcess; trevTree m_Tree; - QColor getBgColor(const QString&nodeName)const; - bool isStart(const QString&nodeName)const; - char getAction(const QString&)const; - const QString&getLabelstring(const QString&nodeName); + TQColor getBgColor(const TQString&nodeName)const; + bool isStart(const TQString&nodeName)const; + char getAction(const TQString&)const; + const TQString&getLabelstring(const TQString&nodeName); - QMap m_NodeList; - QMap m_LabelMap; + TQMap m_NodeList; + TQMap m_LabelMap; int _xMargin,_yMargin; GraphViewTip*m_Tip; @@ -124,26 +125,26 @@ protected: double _cvZoom; ZoomPosition m_LastAutoPosition; - virtual void resizeEvent(QResizeEvent*); - virtual void contentsMousePressEvent ( QMouseEvent * e ); - virtual void contentsMouseReleaseEvent ( QMouseEvent * e ); - virtual void contentsMouseMoveEvent ( QMouseEvent*e); - virtual void contentsContextMenuEvent(QContextMenuEvent*e); - virtual void contentsMouseDoubleClickEvent ( QMouseEvent * e ); + virtual void resizeEvent(TQResizeEvent*); + virtual void contentsMousePressEvent ( TQMouseEvent * e ); + virtual void contentsMouseReleaseEvent ( TQMouseEvent * e ); + virtual void contentsMouseMoveEvent ( TQMouseEvent*e); + virtual void contentsContextMenuEvent(TQContextMenuEvent*e); + virtual void contentsMouseDoubleClickEvent ( TQMouseEvent * e ); bool _isMoving; - QPoint _lastPos; + TQPoint _lastPos; bool _noUpdateZoomerPos; - QString _basePath; + TQString _basePath; private: - void updateSizes(QSize s = QSize(0,0)); + void updateSizes(TQSize s = TQSize(0,0)); void updateZoomerPos(); void setNewDirection(int dir); void makeDiffPrev(GraphTreeLabel*); - void makeDiff(const QString&,const QString&); + void makeDiff(const TQString&,const TQString&); void makeSelected(GraphTreeLabel*); void makeCat(GraphTreeLabel*_l); }; diff --git a/src/svnfrontend/graphtree/revisiontree.cpp b/src/svnfrontend/graphtree/revisiontree.cpp index bb64cf7..a334a0c 100644 --- a/src/svnfrontend/graphtree/revisiontree.cpp +++ b/src/svnfrontend/graphtree/revisiontree.cpp @@ -38,12 +38,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #define INTERNALCOPY 1 #define INTERNALRENAME 2 @@ -54,21 +54,21 @@ public: RtreeData(); virtual ~RtreeData(); - QMap m_History; + TQMap m_History; svn::LogEntriesMap m_OldHistory; long max_rev,min_rev; KProgressDialog*progress; - QTime m_stopTick; + TQTime m_stopTick; - QWidget*dlgParent; + TQWidget*dlgParent; RevTreeWidget*m_TreeDisplay; svn::Client*m_Client; - QObject* m_Listener; + TQObject* m_Listener; - bool getLogs(const QString&,const svn::Revision&startr,const svn::Revision&endr,const QString&origin); + bool getLogs(const TQString&,const svn::Revision&startr,const svn::Revision&endr,const TQString&origin); }; RtreeData::RtreeData() @@ -86,13 +86,13 @@ RtreeData::~RtreeData() delete progress; } -bool RtreeData::getLogs(const QString&reposRoot,const svn::Revision&startr,const svn::Revision&endr,const QString&origin) +bool RtreeData::getLogs(const TQString&reposRoot,const svn::Revision&startr,const svn::Revision&endr,const TQString&origin) { if (!m_Listener||!m_Client) { return false; } try { - CursorStack a(Qt::BusyCursor); + CursorStack a(TQt::BusyCursor); StopDlg sdlg(m_Listener,dlgParent, 0,"Logs",i18n("Getting logs - hit cancel for abort")); if (svn::Url::isLocal(reposRoot) ) { @@ -104,31 +104,31 @@ bool RtreeData::getLogs(const QString&reposRoot,const svn::Revision&startr,const } else if (Kdesvnsettings::network_on()) { m_Client->log(reposRoot,endr,startr,m_OldHistory,startr,true,false,0); } else { - KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").arg(i18n("No logcache possible due broken database and networking not allowed."))); + KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").tqarg(i18n("No logcache possible due broken database and networking not allowed."))); return false; } } } catch (const svn::Exception&ce) { kdDebug()<m_Client=aClient; m_Data->m_Listener=aListener; - m_Data->dlgParent=parent; + m_Data->dlgParent=tqparent; if (!m_Data->getLogs(reposRoot,startr,endr,origin)) { return; @@ -138,7 +138,7 @@ RevisionTree::RevisionTree(svn::Client*aClient, kdDebug()<<"Origin: "<progress=new KProgressDialog( - parent,"progressdlg",i18n("Scanning logs"),i18n("Scanning the logs for %1").arg(origin),true); + tqparent,"progressdlg",i18n("Scanning logs"),i18n("Scanning the logs for %1").tqarg(origin),true); m_Data->progress->setMinimumDuration(100); m_Data->progress->show(); m_Data->progress->setAllowCancel(true); @@ -206,7 +206,7 @@ RevisionTree::~RevisionTree() delete m_Data; } -bool RevisionTree::isDeleted(long revision,const QString&path) +bool RevisionTree::isDeleted(long revision,const TQString&path) { for (unsigned i = 0;im_History[revision].changedPaths.count();++i) { if (isParent(m_Data->m_History[revision].changedPaths[i].path,path) && @@ -221,8 +221,8 @@ bool RevisionTree::topDownScan() { m_Data->progress->progressBar()->setTotalSteps(m_Data->max_rev-m_Data->min_rev); bool cancel=false; - QString label; - QString olabel = m_Data->progress->labelText(); + TQString label; + TQString olabel = m_Data->progress->labelText(); for (long j=m_Data->max_rev;j>=m_Data->min_rev;--j) { m_Data->progress->progressBar()->setProgress(m_Data->max_rev-j); kapp->processEvents(); @@ -237,7 +237,7 @@ bool RevisionTree::topDownScan() break; } label = i18n("%1
Check change entry %2 of %3") - .arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count()); + .tqarg(olabel).tqarg(i).tqarg(m_Data->m_OldHistory[j].changedPaths.count()); m_Data->progress->setLabel(label); kapp->processEvents(); } @@ -247,8 +247,8 @@ bool RevisionTree::topDownScan() { if (!m_Data->m_OldHistory[j].changedPaths[i].copyFromPath.isEmpty()) { if (m_InitialRevsionm_OldHistory[j].revision) { - QString tmpPath = m_Path; - QString r = m_Path.mid(m_Data->m_OldHistory[j].changedPaths[i].path.length()); + TQString tmpPath = m_Path; + TQString r = m_Path.mid(m_Data->m_OldHistory[j].changedPaths[i].path.length()); m_Path=m_Data->m_OldHistory[j].changedPaths[i].copyFromPath; m_Path+=r; } @@ -278,13 +278,13 @@ bool RevisionTree::topDownScan() cancel=true; break; } - label = i18n("%1
Check change entry %2 of %3").arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count()); + label = i18n("%1
Check change entry %2 of %3").tqarg(olabel).tqarg(i).tqarg(m_Data->m_OldHistory[j].changedPaths.count()); m_Data->progress->setLabel(label); kapp->processEvents(); } if (!m_Data->m_OldHistory[j].changedPaths[i].copyFromPath.isEmpty()) { long r = m_Data->m_OldHistory[j].changedPaths[i].copyFromRevision; - QString sourcepath = m_Data->m_OldHistory[j].changedPaths[i].copyFromPath; + TQString sourcepath = m_Data->m_OldHistory[j].changedPaths[i].copyFromPath; char a = m_Data->m_OldHistory[j].changedPaths[i].action; if (m_Data->m_OldHistory[j].changedPaths[i].path.isEmpty()) { kdDebug()<<"Empty entry! rev " << j << " source " << sourcepath << endl; @@ -331,11 +331,11 @@ bool RevisionTree::topDownScan() cancel=true; break; } - label = i18n("%1
Check change entry %2 of %3").arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count()); + label = i18n("%1
Check change entry %2 of %3").tqarg(olabel).tqarg(i).tqarg(m_Data->m_OldHistory[j].changedPaths.count()); m_Data->progress->setLabel(label); kapp->processEvents(); } - m_Data->m_History[j].addCopyTo(m_Data->m_OldHistory[j].changedPaths[i].path,QString::null,-1,m_Data->m_OldHistory[j].changedPaths[i].action); + m_Data->m_History[j].addCopyTo(m_Data->m_OldHistory[j].changedPaths[i].path,TQString(),-1,m_Data->m_OldHistory[j].changedPaths[i].action); } m_Data->m_History[j].author=m_Data->m_OldHistory[j].author; m_Data->m_History[j].date=m_Data->m_OldHistory[j].date; @@ -346,10 +346,10 @@ bool RevisionTree::topDownScan() return !cancel; } -bool RevisionTree::isParent(const QString&_par,const QString&tar) +bool RevisionTree::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); } @@ -358,22 +358,22 @@ bool RevisionTree::isValid()const return m_Valid; } -static QString uniqueNodeName(long rev,const QString&path) +static TQString uniqueNodeName(long rev,const TQString&path) { - QString res = KCodecs::base64Encode(path.local8Bit(),false); - res.replace("\"","_quot_"); - res.replace(" ","_space_"); - QString n; n.sprintf("%05ld",rev); - res = "\""+n+QString("_%1\"").arg(res); + TQString res = KCodecs::base64Encode(path.local8Bit(),false); + res.tqreplace("\"","_quot_"); + res.tqreplace(" ","_space_"); + TQString n; n.sprintf("%05ld",rev); + res = "\""+n+TQString("_%1\"").tqarg(res); return res; } -bool RevisionTree::bottomUpScan(long startrev,unsigned recurse,const QString&_path,long _last) +bool RevisionTree::bottomUpScan(long startrev,unsigned recurse,const TQString&_path,long _last) { #define REVENTRY m_Data->m_History[j] #define FORWARDENTRY m_Data->m_History[j].changedPaths[i] - QString path = _path; + TQString path = _path; long lastrev = _last; /* this is required if an item will modified AND copied at same revision.*/ long trev = -1; @@ -396,7 +396,7 @@ bool RevisionTree::bottomUpScan(long startrev,unsigned recurse,const QString&_pa if (!isParent(FORWARDENTRY.path,path)) { continue; } - QString n1,n2; + TQString n1,n2; if (isParent(FORWARDENTRY.path,path)) { bool get_out = false; if (FORWARDENTRY.path!=path) { @@ -407,12 +407,12 @@ bool RevisionTree::bottomUpScan(long startrev,unsigned recurse,const QString&_pa if (FORWARDENTRY.action==INTERNALCOPY || FORWARDENTRY.action==INTERNALRENAME ) { bool ren = FORWARDENTRY.action==INTERNALRENAME; - QString tmpPath = path; - QString recPath; + TQString tmpPath = path; + TQString recPath; if (FORWARDENTRY.copyToPath.length()==0) { continue; } - QString r = path.mid(FORWARDENTRY.path.length()); + TQString r = path.mid(FORWARDENTRY.path.length()); recPath= FORWARDENTRY.copyToPath; recPath+=r; n1 = uniqueNodeName(lastrev,tmpPath); @@ -521,12 +521,12 @@ bool RevisionTree::bottomUpScan(long startrev,unsigned recurse,const QString&_pa return !cancel; } -QWidget*RevisionTree::getView() +TQWidget*RevisionTree::getView() { return m_Data->m_TreeDisplay; } -void RevisionTree::fillItem(long rev,int pathIndex,const QString&nodeName,const QString&path) +void RevisionTree::fillItem(long rev,int pathIndex,const TQString&nodeName,const TQString&path) { m_Data->m_TreeDisplay->m_RevGraphView->m_Tree[nodeName].name=path; m_Data->m_TreeDisplay->m_RevGraphView->m_Tree[nodeName].rev = rev; diff --git a/src/svnfrontend/graphtree/revisiontree.h b/src/svnfrontend/graphtree/revisiontree.h index 508306f..175754d 100644 --- a/src/svnfrontend/graphtree/revisiontree.h +++ b/src/svnfrontend/graphtree/revisiontree.h @@ -24,12 +24,12 @@ #include "src/svnqt/revision.hpp" #include "src/svnqt/client.hpp" -#include -#include -#include +#include +#include +#include class RtreeData; -class QWidget; +class TQWidget; class KListViewItem; class KListView; class CContextListener; @@ -45,31 +45,31 @@ namespace svn class RevisionTree{ public: RevisionTree(svn::Client*, - QObject*aListener, - const QString& reposRoot, + TQObject*aListener, + const TQString& reposRoot, const svn::Revision&startr,const svn::Revision&endr, - const QString&,const svn::Revision& baserevision,QWidget*treeParent, - QWidget*parent=0); + const TQString&,const svn::Revision& baserevision,TQWidget*treeParent, + TQWidget*tqparent=0); virtual ~RevisionTree(); bool isValid()const; - QWidget*getView(); + TQWidget*getView(); protected: long m_Baserevision; long m_InitialRevsion; - QString m_Path; + TQString m_Path; bool m_Valid; RtreeData*m_Data; bool topDownScan(); - bool bottomUpScan(long startrev,unsigned recurse,const QString&path,long sRev = -1); - bool isDeleted(long revision,const QString&); + bool bottomUpScan(long startrev,unsigned recurse,const TQString&path,long sRev = -1); + bool isDeleted(long revision,const TQString&); - static bool isParent(const QString&_par,const QString&tar); + static bool isParent(const TQString&_par,const TQString&tar); - void fillItem(long revIndex,int pathIndex,const QString&nodeName,const QString&path); + void fillItem(long revIndex,int pathIndex,const TQString&nodeName,const TQString&path); }; #endif diff --git a/src/svnfrontend/graphtree/revtreewidget.cpp b/src/svnfrontend/graphtree/revtreewidget.cpp index 35b5258..eaf6fcc 100644 --- a/src/svnfrontend/graphtree/revtreewidget.cpp +++ b/src/svnfrontend/graphtree/revtreewidget.cpp @@ -20,55 +20,55 @@ #include "revtreewidget.h" #include "src/settings/kdesvnsettings.h" -#include -#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include "revgraphview.h" #include "ktextbrowser.h" /* - * Constructs a RevTreeWidget as a child of 'parent', with the + * Constructs a RevTreeWidget as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -RevTreeWidget::RevTreeWidget(QObject*lt,svn::Client*cl, QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +RevTreeWidget::RevTreeWidget(TQObject*lt,svn::Client*cl, TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { if ( !name ) setName( "RevTreeWidget" ); - RevTreeWidgetLayout = new QVBoxLayout( this, 11, 6, "RevTreeWidgetLayout"); + RevTreeWidgetLayout = new TQVBoxLayout( this, 11, 6, "RevTreeWidgetLayout"); - m_Splitter = new QSplitter( this, "m_Splitter" ); - m_Splitter->setOrientation( QSplitter::Vertical ); + m_Splitter = new TQSplitter( this, "m_Splitter" ); + m_Splitter->setOrientation( Qt::Vertical ); m_RevGraphView = new RevGraphView(lt,cl, m_Splitter, "m_RevGraphView" ); - m_RevGraphView->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 2, m_RevGraphView->sizePolicy().hasHeightForWidth() ) ); - connect(m_RevGraphView,SIGNAL(dispDetails(const QString&)),this,SLOT(setDetailText(const QString&))); + m_RevGraphView->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 2, m_RevGraphView->sizePolicy().hasHeightForWidth() ) ); + connect(m_RevGraphView,TQT_SIGNAL(dispDetails(const TQString&)),this,TQT_SLOT(setDetailText(const TQString&))); connect(m_RevGraphView, - SIGNAL(makeNorecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*)), + TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), this, - SIGNAL(makeNorecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*)) + TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) ); connect(m_RevGraphView, - SIGNAL(makeRecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*)), + TQT_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), this, - SIGNAL(makeRecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*)) + TQT_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) ); connect(m_RevGraphView, - SIGNAL(makeCat(const svn::Revision&,const QString&,const QString&,const svn::Revision&,QWidget*)), + TQT_SIGNAL(makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)), this, - SIGNAL(makeCat(const svn::Revision&,const QString&,const QString&,const svn::Revision&,QWidget*)) + TQT_SIGNAL(makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)) ); m_Detailstext = new KTextBrowser( m_Splitter, "m_Detailstext" ); - m_Detailstext->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, m_Detailstext->sizePolicy().hasHeightForWidth() ) ); + m_Detailstext->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, m_Detailstext->sizePolicy().hasHeightForWidth() ) ); m_Detailstext->setResizePolicy( KTextBrowser::Manual ); RevTreeWidgetLayout->addWidget( m_Splitter ); - resize( QSize(600, 480).expandedTo(minimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); - QValueList list = Kdesvnsettings::tree_detail_height(); + TQValueList list = Kdesvnsettings::tree_detail_height(); if (list.count()==2 && (list[0]>0||list[1]>0)) { m_Splitter->setSizes(list); } @@ -79,15 +79,15 @@ RevTreeWidget::RevTreeWidget(QObject*lt,svn::Client*cl, QWidget* parent, const c */ RevTreeWidget::~RevTreeWidget() { - // no need to delete child widgets, Qt does it all for us - QValueList list = m_Splitter->sizes(); + // no need to delete child widgets, TQt does it all for us + TQValueList list = m_Splitter->sizes(); if (list.count()==2) { Kdesvnsettings::setTree_detail_height(list); Kdesvnsettings::writeConfig(); } } -void RevTreeWidget::setBasePath(const QString&_p) +void RevTreeWidget::setBasePath(const TQString&_p) { m_RevGraphView->setBasePath(_p); } @@ -97,10 +97,10 @@ void RevTreeWidget::dumpRevtree() m_RevGraphView->dumpRevtree(); } -void RevTreeWidget::setDetailText(const QString&_s) +void RevTreeWidget::setDetailText(const TQString&_s) { m_Detailstext->setText(_s); - QValueList list = m_Splitter->sizes(); + TQValueList list = m_Splitter->sizes(); if (list.count()!=2) return; if (list[1]==0) { int h = height(); diff --git a/src/svnfrontend/graphtree/revtreewidget.h b/src/svnfrontend/graphtree/revtreewidget.h index 324f0ba..61e4753 100644 --- a/src/svnfrontend/graphtree/revtreewidget.h +++ b/src/svnfrontend/graphtree/revtreewidget.h @@ -22,16 +22,16 @@ #include -#include -#include -#include +#include +#include +#include -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QSpacerItem; +class TQVBoxLayout; +class TQHBoxLayout; +class TQGridLayout; +class TQSpacerItem; class RevGraphView; -class QSplitter; +class TQSplitter; class KTextBrowser; class CContextListener; @@ -40,34 +40,35 @@ namespace svn { class Client; } -class RevTreeWidget : public QWidget +class RevTreeWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - RevTreeWidget(QObject*,svn::Client*,QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + RevTreeWidget(TQObject*,svn::Client*,TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~RevTreeWidget(); - QSplitter* m_Splitter; + TQSplitter* m_Splitter; RevGraphView* m_RevGraphView; - void setBasePath(const QString&); + void setBasePath(const TQString&); void dumpRevtree(); protected: - QVBoxLayout* RevTreeWidgetLayout; + TQVBoxLayout* RevTreeWidgetLayout; KTextBrowser* m_Detailstext; signals: - void makeCat(const svn::Revision&,const QString&,const QString&,const svn::Revision&,QWidget*); - void makeNorecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*); - void makeRecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*); + void makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*); + void makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*); + void makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*); protected slots: - virtual void setDetailText(const QString&); + virtual void setDetailText(const TQString&); private: - QPixmap image0; + TQPixmap image0; }; diff --git a/src/svnfrontend/hotcopydlg.ui b/src/svnfrontend/hotcopydlg.ui index ac0ac7d..27d41df 100644 --- a/src/svnfrontend/hotcopydlg.ui +++ b/src/svnfrontend/hotcopydlg.ui @@ -1,10 +1,10 @@ HotcopyDlg - + HotcopyDlg - + 0 0 @@ -16,22 +16,22 @@ unnamed - + - layout2 + tqlayout2 unnamed - + m_Destlabel Destination folder: - + AlignVCenter|AlignRight @@ -51,20 +51,20 @@ 18 - + m_Srclabel Repository to copy: - + WordBreak|AlignVCenter|AlignRight - + m_Cleanlogs @@ -82,7 +82,7 @@ - + kurlrequester.h klineedit.h diff --git a/src/svnfrontend/hotcopydlg_impl.cpp b/src/svnfrontend/hotcopydlg_impl.cpp index 9211929..67ef264 100644 --- a/src/svnfrontend/hotcopydlg_impl.cpp +++ b/src/svnfrontend/hotcopydlg_impl.cpp @@ -19,12 +19,12 @@ ***************************************************************************/ #include "hotcopydlg_impl.h" -#include +#include #include #include -HotcopyDlg_impl::HotcopyDlg_impl(QWidget *parent, const char *name) - :HotcopyDlg(parent, name) +HotcopyDlg_impl::HotcopyDlg_impl(TQWidget *tqparent, const char *name) + :HotcopyDlg(tqparent, name) { } @@ -32,12 +32,12 @@ HotcopyDlg_impl::~HotcopyDlg_impl() { } -QString HotcopyDlg_impl::srcPath()const +TQString HotcopyDlg_impl::srcPath()const { return checkPath(m_SrcpathEditor->url()); } -QString HotcopyDlg_impl::destPath()const +TQString HotcopyDlg_impl::destPath()const { return checkPath(m_DestpathEditor->url()); } @@ -47,10 +47,10 @@ bool HotcopyDlg_impl::cleanLogs()const return m_Cleanlogs->isChecked(); } -QString HotcopyDlg_impl::checkPath(const QString&_p)const +TQString HotcopyDlg_impl::checkPath(const TQString&_p)const { KURL u = _p; - QString res = u.path(); + TQString res = u.path(); while (res.endsWith("/")) { res.truncate(res.length()-1); } diff --git a/src/svnfrontend/hotcopydlg_impl.h b/src/svnfrontend/hotcopydlg_impl.h index 54655ac..fcfb9f7 100644 --- a/src/svnfrontend/hotcopydlg_impl.h +++ b/src/svnfrontend/hotcopydlg_impl.h @@ -24,16 +24,17 @@ class HotcopyDlg_impl: public HotcopyDlg { Q_OBJECT + TQ_OBJECT public: - HotcopyDlg_impl(QWidget *parent = 0, const char *name = 0); + HotcopyDlg_impl(TQWidget *tqparent = 0, const char *name = 0); virtual ~HotcopyDlg_impl(); - QString srcPath()const; - QString destPath()const; + TQString srcPath()const; + TQString destPath()const; bool cleanLogs()const; private: - QString checkPath(const QString&)const; + TQString checkPath(const TQString&)const; public slots: diff --git a/src/svnfrontend/importdir_logmsg.cpp b/src/svnfrontend/importdir_logmsg.cpp index 16a6394..9300d59 100644 --- a/src/svnfrontend/importdir_logmsg.cpp +++ b/src/svnfrontend/importdir_logmsg.cpp @@ -23,39 +23,39 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -Importdir_logmsg::Importdir_logmsg(QWidget *parent, const char *name) - : Logmsg_impl(parent, name) +Importdir_logmsg::Importdir_logmsg(TQWidget *tqparent, const char *name) + : Logmsg_impl(tqparent, name) { - m_createDirBox = new QCheckBox("",this,"create_dir_checkbox"); + m_createDirBox = new TQCheckBox("",this,"create_dir_checkbox"); m_keepLocksButton->hide(); //delete m_keepLocksButton; createDirboxDir(); addItemWidget(m_createDirBox); m_createDirBox->setChecked(true); - QHBoxLayout* tmpLayout = new QHBoxLayout( this, 11, 6, "ExtraLayout"); - m_noIgnore = new QCheckBox("",this,"no_ignore_pattern"); + TQHBoxLayout* tmpLayout = new TQHBoxLayout( this, 11, 6, "ExtraLayout"); + m_noIgnore = new TQCheckBox("",this,"no_ignore_pattern"); m_noIgnore->setText(i18n("No ignore")); - QToolTip::add(m_noIgnore,i18n("If set, add files or directories that match ignore patterns.")); + TQToolTip::add(m_noIgnore,i18n("If set, add files or directories that match ignore patterns.")); tmpLayout->addWidget(m_noIgnore); //LogmessageDataLayout->addWidget(m_createDirBox); if (svn::Version::version_major()>1|| svn::Version::version_minor()>4 ) { - m_ignoreUnknownNodes = new QCheckBox("",this,"ignore_unknown_nodes_box"); + m_ignoreUnknownNodes = new TQCheckBox("",this,"ignore_unknown_nodes_box"); m_ignoreUnknownNodes->setText(i18n("Ignore unknown node types")); - QToolTip::add(m_ignoreUnknownNodes,i18n("Should files with unknown node types be ignored")); - QWhatsThis::add(m_ignoreUnknownNodes,i18n("Ignore files of which the node type is unknown, such as device files and pipes.")); + TQToolTip::add(m_ignoreUnknownNodes,i18n("Should files with unknown node types be ignored")); + TQWhatsThis::add(m_ignoreUnknownNodes,i18n("Ignore files of which the node type is unknown, such as device files and pipes.")); tmpLayout->addWidget(m_ignoreUnknownNodes); //addItemWidget(m_ignoreUnknownNodes); } else { m_ignoreUnknownNodes=0; } - QSpacerItem* m_leftspacer = new QSpacerItem( 40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem* m_leftspacer = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); tmpLayout->addItem(m_leftspacer); LogmessageDataLayout->addItem(tmpLayout); } @@ -79,9 +79,9 @@ bool Importdir_logmsg::createDir() return m_createDirBox->isChecked(); } -void Importdir_logmsg::createDirboxDir(const QString & which) +void Importdir_logmsg::createDirboxDir(const TQString & which) { - m_createDirBox->setText(i18n("Create subdir %1 on import").arg(which.isEmpty()?i18n("(Last part)"):which)); + m_createDirBox->setText(i18n("Create subdir %1 on import").tqarg(which.isEmpty()?i18n("(Last part)"):which)); } #include "importdir_logmsg.moc" diff --git a/src/svnfrontend/importdir_logmsg.h b/src/svnfrontend/importdir_logmsg.h index 8a7aacb..a32ca1b 100644 --- a/src/svnfrontend/importdir_logmsg.h +++ b/src/svnfrontend/importdir_logmsg.h @@ -22,27 +22,28 @@ #include "src/ksvnwidgets/logmsg_impl.h" -class QCheckBox; +class TQCheckBox; /** @author Rajko Albrecht */ class Importdir_logmsg : public Logmsg_impl { Q_OBJECT + TQ_OBJECT public: - Importdir_logmsg(QWidget *parent = 0, const char *name = 0); + Importdir_logmsg(TQWidget *tqparent = 0, const char *name = 0); virtual ~Importdir_logmsg(); bool createDir(); bool ignoreUnknownNodes(); bool noIgnore(); - void createDirboxDir(const QString & which=QString::null); + void createDirboxDir(const TQString & which=TQString()); protected: - QCheckBox*m_createDirBox; - QCheckBox*m_ignoreUnknownNodes; - QCheckBox*m_noIgnore; + TQCheckBox*m_createDirBox; + TQCheckBox*m_ignoreUnknownNodes; + TQCheckBox*m_noIgnore; }; #endif diff --git a/src/svnfrontend/itemdisplay.cpp b/src/svnfrontend/itemdisplay.cpp index 6a675ed..d037e80 100644 --- a/src/svnfrontend/itemdisplay.cpp +++ b/src/svnfrontend/itemdisplay.cpp @@ -34,7 +34,7 @@ bool ItemDisplay::isWorkingCopy()const return m_isWorkingCopy; } -const QString&ItemDisplay::baseUri()const +const TQString&ItemDisplay::baseUri()const { return m_baseUri; } @@ -57,7 +57,7 @@ void ItemDisplay::setNetworked(bool how) m_isNetworked=how; } -void ItemDisplay::setBaseUri(const QString&uri) +void ItemDisplay::setBaseUri(const TQString&uri) { m_baseUri = uri; /* otherwise subversion lib asserts! */ @@ -66,7 +66,7 @@ void ItemDisplay::setBaseUri(const QString&uri) } } -const QString&ItemDisplay::lastError()const +const TQString&ItemDisplay::lastError()const { return m_LastException; } @@ -82,13 +82,13 @@ bool ItemDisplay::filterOut(const SvnItem*item) /*! - \fn ItemDisplay::filterOut(const svn::Status&) + \fn ItemDisplay::filterOut(const svn::tqStatus&) */ bool ItemDisplay::filterOut(const svn::StatusPtr&item) { bool res = false; - if (!item->validReposStatus()) { + if (!item->validRepostqStatus()) { if ((!Kdesvnsettings::display_unknown_files() && !item->isVersioned()) || (Kdesvnsettings::hide_unchanged_files() && item->isRealVersioned() && !item->isModified() && !item->entry().isDir())) { res = true; @@ -101,12 +101,12 @@ bool ItemDisplay::filterOut(const svn::StatusPtr&item) /*! \fn ItemDisplay::relativePath(const SvnItem*item) */ -QString ItemDisplay::relativePath(const SvnItem*item) +TQString ItemDisplay::relativePath(const SvnItem*item) { if (!isWorkingCopy()||!item->fullName().startsWith(baseUri())) { return item->fullName(); } - QString name = item->fullName(); + TQString name = item->fullName(); if (name==baseUri()) { name = "."; } else { diff --git a/src/svnfrontend/itemdisplay.h b/src/svnfrontend/itemdisplay.h index b487904..caf09da 100644 --- a/src/svnfrontend/itemdisplay.h +++ b/src/svnfrontend/itemdisplay.h @@ -22,17 +22,17 @@ #define __ITEMDISPLAY_H #include "src/svnqt/svnqttypes.hpp" -#include -#include +#include +#include #include -class QWidget; +class TQWidget; class SvnItem; namespace svn { - class Status; + class tqStatus; } class ItemDisplay @@ -41,28 +41,28 @@ public: ItemDisplay(); virtual ~ItemDisplay(){} virtual bool isWorkingCopy()const; - virtual QWidget*realWidget() = 0; + virtual TQWidget*realWidget() = 0; virtual SvnItem*Selected()=0; - virtual void SelectionList(QPtrList*)=0; - virtual const QString&baseUri()const; + virtual void SelectionList(TQPtrList*)=0; + virtual const TQString&baseUri()const; virtual bool openURL( const KURL &url,bool noReinit=false )=0; virtual SvnItem*SelectedOrMain()=0; virtual bool isNetworked()const; - virtual const QString&lastError()const; + virtual const TQString&lastError()const; virtual bool filterOut(const SvnItem*); virtual bool filterOut(const svn::StatusPtr&); - QString relativePath(const SvnItem*item); + TQString relativePath(const SvnItem*item); protected: void setWorkingCopy(bool); void setNetworked(bool); - void setBaseUri(const QString&); - QString m_LastException; + void setBaseUri(const TQString&); + TQString m_LastException; private: bool m_isWorkingCopy; bool m_isNetworked; - QString m_baseUri; + TQString m_baseUri; }; #endif diff --git a/src/svnfrontend/kdesvnfilelist.cpp b/src/svnfrontend/kdesvnfilelist.cpp index d9116cb..ba2249d 100644 --- a/src/svnfrontend/kdesvnfilelist.cpp +++ b/src/svnfrontend/kdesvnfilelist.cpp @@ -61,18 +61,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -88,9 +88,9 @@ public: delete m_fileTip; kdDebug()<<"Destructor KdesvnFileListPrivate done"< dirItems; + TQMap dirItems; void stopDirTimer() { @@ -125,9 +125,9 @@ public: dirwatch_timer.start(250,true); } - void connectDirTimer(QObject*ob) + void connectDirTimer(TQObject*ob) { - QObject::connect(&dirwatch_timer,SIGNAL(timeout()),ob,SLOT(_dirwatchTimeout())); + TQObject::connect(&dirwatch_timer,TQT_SIGNAL(timeout()),ob,TQT_SLOT(_dirwatchTimeout())); } void stopScan() { @@ -149,9 +149,9 @@ public: { propTimer.stop(); } - void connectPropTimer(QObject*ob) + void connectPropTimer(TQObject*ob) { - QObject::connect(&propTimer,SIGNAL(timeout()),ob,SLOT(_propListTimeout())); + TQObject::connect(&propTimer,TQT_SIGNAL(timeout()),ob,TQT_SLOT(_propListTimeout())); } private: @@ -159,7 +159,7 @@ private: }; KdesvnFileListPrivate::KdesvnFileListPrivate() - : dragOverItem(0),dragOverPoint(QPoint(0,0)),mOldDropHighlighter() + : dragOverItem(0),dragOverPoint(TQPoint(0,0)),mOldDropHighlighter() { m_remoteRevision = svn::Revision::HEAD; m_DirWatch = 0; @@ -189,15 +189,15 @@ bool KdesvnFileListPrivate::reReadSettings() _unknown != mdisp_unknown_files); } -kdesvnfilelist::kdesvnfilelist(KActionCollection*aCollect,QWidget *parent, const char *name) - : KListView(parent, name),ItemDisplay(),m_SvnWrapper(new SvnActions(this)) +kdesvnfilelist::kdesvnfilelist(KActionCollection*aCollect,TQWidget *tqparent, const char *name) + : KListView(tqparent, name),ItemDisplay(),m_SvnWrapper(new SvnActions(this)) { m_SelectedItems = 0; m_pList = new KdesvnFileListPrivate; m_filesAction = aCollect; m_pList->m_fileTip=new SvnFileTip(this); m_pList->m_fileTip->setOptions(Kdesvnsettings::display_file_tips()&& - QToolTip::isGloballyEnabled(),true,6); + TQToolTip::isGloballyEnabled(),true,6); SshAgent ssh; ssh.querySshAgent(); @@ -208,7 +208,7 @@ kdesvnfilelist::kdesvnfilelist(KActionCollection*aCollect,QWidget *parent, const setAllColumnsShowFocus (true); setRootIsDecorated(true); addColumn(i18n("Name")); - addColumn(i18n("Status")); + addColumn(i18n("tqStatus")); addColumn(i18n("Last changed Revision")); addColumn(i18n("Last author")); addColumn(i18n("Last change date")); @@ -216,30 +216,30 @@ kdesvnfilelist::kdesvnfilelist(KActionCollection*aCollect,QWidget *parent, const setSortColumn(FileListViewItem::COL_NAME); setupActions(); - 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))); /* not via executed 'cause click may used for selection - single click execution just confuses in an application */ - connect(this,SIGNAL(doubleClicked(QListViewItem*)),this,SLOT(slotItemDoubleClicked(QListViewItem*))); - connect(this,SIGNAL(returnPressed(QListViewItem*)),this,SLOT(slotItemDoubleClicked(QListViewItem*))); - - connect(this,SIGNAL(selectionChanged()),this,SLOT(slotSelectionChanged())); - connect(m_SvnWrapper,SIGNAL(clientException(const QString&)),this,SLOT(slotClientException(const QString&))); - connect(m_SvnWrapper,SIGNAL(sendNotify(const QString&)),this,SLOT(slotNotifyMessage(const QString&))); - connect(m_SvnWrapper,SIGNAL(reinitItem(SvnItem*)),this,SLOT(slotReinitItem(SvnItem*))); - connect(m_SvnWrapper,SIGNAL(sigRefreshAll()),this,SLOT(refreshCurrentTree())); - connect(m_SvnWrapper,SIGNAL(sigRefreshCurrent(SvnItem*)),this,SLOT(refreshCurrent(SvnItem*))); - connect(m_SvnWrapper,SIGNAL(sigRefreshIcons(bool)),this,SLOT(slotRescanIcons(bool))); - connect(this,SIGNAL(dropped (QDropEvent*,QListViewItem*)), - this,SLOT(slotDropped(QDropEvent*,QListViewItem*))); - connect(m_SvnWrapper,SIGNAL(sigGotourl(const QString&)),this,SLOT(_openURL(const QString&))); - - connect(m_SvnWrapper,SIGNAL(sigCacheStatus(Q_LONG,Q_LONG)),this,SIGNAL(sigCacheStatus(Q_LONG,Q_LONG))); - connect(m_SvnWrapper,SIGNAL(sigThreadsChanged()),this,SLOT(enableActions())); - - m_pList->connectDirTimer(this); - m_pList->connectPropTimer(this); + connect(this,TQT_SIGNAL(doubleClicked(TQListViewItem*)),this,TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); + connect(this,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); + + connect(this,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotSelectionChanged())); + connect(m_SvnWrapper,TQT_SIGNAL(clientException(const TQString&)),this,TQT_SLOT(slotClientException(const TQString&))); + connect(m_SvnWrapper,TQT_SIGNAL(sendNotify(const TQString&)),this,TQT_SLOT(slotNotifyMessage(const TQString&))); + connect(m_SvnWrapper,TQT_SIGNAL(reinitItem(SvnItem*)),this,TQT_SLOT(slotReinitItem(SvnItem*))); + connect(m_SvnWrapper,TQT_SIGNAL(sigRefreshAll()),this,TQT_SLOT(refreshCurrentTree())); + connect(m_SvnWrapper,TQT_SIGNAL(sigRefreshCurrent(SvnItem*)),this,TQT_SLOT(refreshCurrent(SvnItem*))); + connect(m_SvnWrapper,TQT_SIGNAL(sigRefreshIcons(bool)),this,TQT_SLOT(slotRescanIcons(bool))); + connect(this,TQT_SIGNAL(dropped (TQDropEvent*,TQListViewItem*)), + this,TQT_SLOT(slotDropped(TQDropEvent*,TQListViewItem*))); + connect(m_SvnWrapper,TQT_SIGNAL(sigGotourl(const TQString&)),this,TQT_SLOT(_openURL(const TQString&))); + + connect(m_SvnWrapper,TQT_SIGNAL(sigCachetqStatus(TQ_LONG,TQ_LONG)),this,TQT_SIGNAL(sigCachetqStatus(TQ_LONG,TQ_LONG))); + connect(m_SvnWrapper,TQT_SIGNAL(sigThreadsChanged()),this,TQT_SLOT(enableActions())); + + m_pList->connectDirTimer(TQT_TQOBJECT(this)); + m_pList->connectPropTimer(TQT_TQOBJECT(this)); setDropHighlighter(true); setDragEnabled(true); @@ -259,152 +259,152 @@ void kdesvnfilelist::setupActions() KAction*tmp_action; /* local and remote actions */ /* 1. actions on dirs AND files */ - //new KAction(i18n("Log..."),"kdesvnlog",KShortcut(SHIFT+CTRL+Key_L),this,SLOT(slotMakeRangeLog()),m_filesAction,"make_svn_log"); - new KAction(i18n("Full Log"),"kdesvnlog",KShortcut(CTRL+Key_L),this,SLOT(slotMakeLog()),m_filesAction,"make_svn_log_full"); - new KAction(i18n("Full revision tree"),"kdesvnlog",KShortcut(CTRL+Key_T),this,SLOT(slotMakeTree()),m_filesAction,"make_svn_tree"); + //new KAction(i18n("Log..."),"kdesvnlog",KShortcut(SHIFT+CTRL+Key_L),this,TQT_SLOT(slotMakeRangeLog()),m_filesAction,"make_svn_log"); + new KAction(i18n("Full Log"),"kdesvnlog",KShortcut(CTRL+Key_L),TQT_TQOBJECT(this),TQT_SLOT(slotMakeLog()),m_filesAction,"make_svn_log_full"); + new KAction(i18n("Full revision tree"),"kdesvnlog",KShortcut(CTRL+Key_T),TQT_TQOBJECT(this),TQT_SLOT(slotMakeTree()),m_filesAction,"make_svn_tree"); new KAction(i18n("Partial revision tree"),"kdesvnlog",KShortcut(SHIFT+CTRL+Key_T), - this,SLOT(slotMakePartTree()),m_filesAction,"make_svn_partialtree"); + TQT_TQOBJECT(this),TQT_SLOT(slotMakePartTree()),m_filesAction,"make_svn_partialtree"); new KAction(i18n("Properties"),"edit", - KShortcut(CTRL+Key_P),m_SvnWrapper,SLOT(slotProperties()),m_filesAction,"make_svn_property"); + KShortcut(CTRL+Key_P),m_SvnWrapper,TQT_SLOT(slotProperties()),m_filesAction,"make_svn_property"); new KAction(i18n("Display Properties"),"edit", - KShortcut(SHIFT+CTRL+Key_P),this,SLOT(slotDisplayProperties()),m_filesAction,"get_svn_property"); + KShortcut(SHIFT+CTRL+Key_P),TQT_TQOBJECT(this),TQT_SLOT(slotDisplayProperties()),m_filesAction,"get_svn_property"); tmp_action = new KAction(i18n("Display last changes"),"kdesvndiff", - KShortcut(),this,SLOT(slotDisplayLastDiff()),m_filesAction,"make_last_change"); + KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDisplayLastDiff()),m_filesAction,"make_last_change"); tmp_action->setToolTip(i18n("Display last changes as difference to previous commit.")); m_InfoAction = new KAction(i18n("Details"),"kdesvninfo", - KShortcut(CTRL+Key_I),this,SLOT(slotInfo()),m_filesAction,"make_svn_info"); + KShortcut(CTRL+Key_I),TQT_TQOBJECT(this),TQT_SLOT(slotInfo()),m_filesAction,"make_svn_info"); m_RenameAction = new KAction(i18n("Move"),"move", - KShortcut(Key_F2),this,SLOT(slotRename()),m_filesAction,"make_svn_rename"); + KShortcut(Key_F2),TQT_TQOBJECT(this),TQT_SLOT(slotRename()),m_filesAction,"make_svn_rename"); m_CopyAction = new KAction(i18n("Copy"),"kdesvncopy", - KShortcut(CTRL+Key_C),this,SLOT(slotCopy()),m_filesAction,"make_svn_copy"); - tmp_action = new KAction(i18n("Check for updates"),"kdesvncheckupdates",KShortcut(),this,SLOT(slotCheckUpdates()),m_filesAction,"make_check_updates"); + KShortcut(CTRL+Key_C),TQT_TQOBJECT(this),TQT_SLOT(slotCopy()),m_filesAction,"make_svn_copy"); + tmp_action = new KAction(i18n("Check for updates"),"kdesvncheckupdates",KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCheckUpdates()),m_filesAction,"make_check_updates"); tmp_action->setToolTip(i18n("Check if current working copy has items with newer version in repository")); /* 2. actions only on files */ m_BlameAction = new KAction(i18n("Blame"),"kdesvnblame", - KShortcut(),this,SLOT(slotBlame()),m_filesAction,"make_svn_blame"); + KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotBlame()),m_filesAction,"make_svn_blame"); m_BlameAction->setToolTip(i18n("Output the content of specified files or URLs with revision and author information in-line.")); m_BlameRangeAction = new KAction(i18n("Blame range"),"kdesvnblame", - KShortcut(),this,SLOT(slotRangeBlame()),m_filesAction,"make_svn_range_blame"); + KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotRangeBlame()),m_filesAction,"make_svn_range_blame"); m_BlameRangeAction->setToolTip(i18n("Output the content of specified files or URLs with revision and author information in-line.")); m_CatAction = new KAction(i18n("Cat head"), "kdesvncat", - KShortcut(),this,SLOT(slotCat()),m_filesAction,"make_svn_cat"); + KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCat()),m_filesAction,"make_svn_cat"); m_CatAction->setToolTip(i18n("Output the content of specified files or URLs.")); tmp_action = new KAction(i18n("Cat revision..."),"kdesvncat", - KShortcut(),this,SLOT(slotRevisionCat()),m_filesAction,"make_revisions_cat"); + KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotRevisionCat()),m_filesAction,"make_revisions_cat"); tmp_action->setToolTip(i18n("Output the content of specified files or URLs at specific revision.")); m_LockAction = new KAction(i18n("Lock current items"),"kdesvnlock", - KShortcut(),this,SLOT(slotLock()),m_filesAction,"make_svn_lock"); + KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotLock()),m_filesAction,"make_svn_lock"); m_UnlockAction = new KAction(i18n("Unlock current items"),"kdesvnunlock", - KShortcut(),this,SLOT(slotUnlock()),m_filesAction,"make_svn_unlock"); + KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotUnlock()),m_filesAction,"make_svn_unlock"); /* 3. actions only on dirs */ m_MkdirAction = new KAction(i18n("New folder"),"folder_new", - KShortcut(),this,SLOT(slotMkdir()),m_filesAction,"make_svn_mkdir"); + KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMkdir()),m_filesAction,"make_svn_mkdir"); m_switchRepository = new KAction(i18n("Switch repository"),"kdesvnswitch", - KShortcut(), m_SvnWrapper,SLOT(slotSwitch()),m_filesAction,"make_svn_switch"); + KShortcut(), m_SvnWrapper,TQT_SLOT(slotSwitch()),m_filesAction,"make_svn_switch"); m_switchRepository->setToolTip(i18n("Switch repository path of current working copy path (\"svn switch\")")); tmp_action = new KAction(i18n("Relocate current working copy url"),"kdesvnrelocate",KShortcut(), - this,SLOT(slotRelocate()),m_filesAction,"make_svn_relocate"); + TQT_TQOBJECT(this),TQT_SLOT(slotRelocate()),m_filesAction,"make_svn_relocate"); tmp_action->setToolTip(i18n("Relocate url of current working copy path to other url")); tmp_action = new KAction(i18n("Check for unversioned items"),"kdesvnaddrecursive",KShortcut(), - this,SLOT(slotCheckNewItems()),m_filesAction,"make_check_unversioned"); + TQT_TQOBJECT(this),TQT_SLOT(slotCheckNewItems()),m_filesAction,"make_check_unversioned"); tmp_action->setToolTip(i18n("Browse folder for unversioned items and add them if wanted.")); m_changeToRepository = new KAction(i18n("Open repository of working copy"),"gohome",KShortcut(), - this,SLOT(slotChangeToRepository()),m_filesAction,"make_switch_to_repo"); + TQT_TQOBJECT(this),TQT_SLOT(slotChangeToRepository()),m_filesAction,"make_switch_to_repo"); m_changeToRepository->setToolTip(i18n("Opens the repository the current working copy was checked out from")); m_CleanupAction = new KAction(i18n("Cleanup"),"kdesvncleanup", - KShortcut(),this,SLOT(slotCleanupAction()),m_filesAction,"make_cleanup"); + KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCleanupAction()),m_filesAction,"make_cleanup"); m_CleanupAction->setToolTip(i18n("Recursively clean up the working copy, removing locks, resuming unfinished operations, etc.")); m_ImportDirsIntoCurrent = new KAction(i18n("Import folders into current"),"fileimport",KShortcut(), - this,SLOT(slotImportDirsIntoCurrent()),m_filesAction,"make_import_dirs_into_current"); + TQT_TQOBJECT(this),TQT_SLOT(slotImportDirsIntoCurrent()),m_filesAction,"make_import_dirs_into_current"); m_ImportDirsIntoCurrent->setToolTip(i18n("Import folder content into current url")); /* local only actions */ /* 1. actions on files AND dirs*/ m_AddCurrent = new KAction(i18n("Add selected files/dirs"), - "kdesvnadd",KShortcut(Key_Insert),m_SvnWrapper,SLOT(slotAdd()),m_filesAction,"make_svn_add"); + "kdesvnadd",KShortcut(Key_Insert),m_SvnWrapper,TQT_SLOT(slotAdd()),m_filesAction,"make_svn_add"); m_AddCurrent->setToolTip(i18n("Adding selected files and/or directories to repository")); tmp_action = new KAction("Add selected files/dirs recursive", - "kdesvnaddrecursive",KShortcut(CTRL+Key_Insert),m_SvnWrapper,SLOT(slotAddRec()),m_filesAction,"make_svn_addrec"); + "kdesvnaddrecursive",KShortcut(CTRL+Key_Insert),m_SvnWrapper,TQT_SLOT(slotAddRec()),m_filesAction,"make_svn_addrec"); tmp_action->setToolTip(i18n("Adding selected files and/or directories to repository and all subitems of folders")); m_DelCurrent = new KAction(i18n("Delete selected files/dirs"),"kdesvndelete", - KShortcut(Key_Delete),this,SLOT(slotDelete()),m_filesAction,"make_svn_remove"); + KShortcut(Key_Delete),TQT_TQOBJECT(this),TQT_SLOT(slotDelete()),m_filesAction,"make_svn_remove"); m_DelCurrent->setToolTip(i18n("Deleting selected files and/or directories from repository")); m_RevertAction = new KAction(i18n("Revert current changes"),"revert", - KShortcut(),m_SvnWrapper,SLOT(slotRevert()),m_filesAction,"make_svn_revert"); + KShortcut(),m_SvnWrapper,TQT_SLOT(slotRevert()),m_filesAction,"make_svn_revert"); m_ResolvedAction = new KAction(i18n("Mark resolved"),KShortcut(), - this,SLOT(slotResolved()),m_filesAction,"make_resolved"); + TQT_TQOBJECT(this),TQT_SLOT(slotResolved()),m_filesAction,"make_resolved"); m_ResolvedAction->setToolTip(i18n("Marking files or dirs resolved")); tmp_action = new KAction(i18n("Resolve conflicts"),KShortcut(), - this,SLOT(slotTryResolve()),m_filesAction,"make_try_resolve"); + TQT_TQOBJECT(this),TQT_SLOT(slotTryResolve()),m_filesAction,"make_try_resolve"); - m_IgnoreAction = new KAction(i18n("Ignore/Unignore current item"),KShortcut(),this,SLOT(slotIgnore()),m_filesAction,"make_svn_ignore"); + m_IgnoreAction = new KAction(i18n("Ignore/Unignore current item"),KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotIgnore()),m_filesAction,"make_svn_ignore"); m_UpdateHead = new KAction(i18n("Update to head"),"kdesvnupdate", - KShortcut(),m_SvnWrapper,SLOT(slotUpdateHeadRec()),m_filesAction,"make_svn_headupdate"); + KShortcut(),m_SvnWrapper,TQT_SLOT(slotUpdateHeadRec()),m_filesAction,"make_svn_headupdate"); m_UpdateRev = new KAction(i18n("Update to revision..."),"kdesvnupdate", - KShortcut(),m_SvnWrapper,SLOT(slotUpdateTo()),m_filesAction,"make_svn_revupdate"); + KShortcut(),m_SvnWrapper,TQT_SLOT(slotUpdateTo()),m_filesAction,"make_svn_revupdate"); m_commitAction = new KAction(i18n("Commit"),"kdesvncommit", - KShortcut("CTRL+#"),m_SvnWrapper,SLOT(slotCommit()),m_filesAction,"make_svn_commit"); + KShortcut("CTRL+#"),m_SvnWrapper,TQT_SLOT(slotCommit()),m_filesAction,"make_svn_commit"); tmp_action = new KAction(i18n("Diff local changes"),"kdesvndiff", - KShortcut(CTRL+Key_D),this,SLOT(slotSimpleBaseDiff()),m_filesAction,"make_svn_basediff"); + KShortcut(CTRL+Key_D),TQT_TQOBJECT(this),TQT_SLOT(slotSimpleBaseDiff()),m_filesAction,"make_svn_basediff"); tmp_action->setToolTip(i18n("Diff working copy against BASE (last checked out version) - doesn't require access to repository")); tmp_action = new KAction(i18n("Diff against HEAD"),"kdesvndiff", - KShortcut(CTRL+Key_H),this,SLOT(slotSimpleHeadDiff()),m_filesAction,"make_svn_headdiff"); + KShortcut(CTRL+Key_H),TQT_TQOBJECT(this),TQT_SLOT(slotSimpleHeadDiff()),m_filesAction,"make_svn_headdiff"); tmp_action->setToolTip(i18n("Diff working copy against HEAD (last checked in version)- requires access to repository")); tmp_action = new KAction(i18n("Diff items"),"kdesvndiff", - KShortcut(),this,SLOT(slotDiffPathes()),m_filesAction,"make_svn_itemsdiff"); + KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDiffPathes()),m_filesAction,"make_svn_itemsdiff"); tmp_action->setToolTip(i18n("Diff two items")); m_MergeRevisionAction = new KAction(i18n("Merge two revisions"),"kdesvnmerge", - KShortcut(),this,SLOT(slotMergeRevisions()),m_filesAction,"make_svn_merge_revisions"); + KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMergeRevisions()),m_filesAction,"make_svn_merge_revisions"); m_MergeRevisionAction->setToolTip(i18n("Merge two revisions of this entry into itself")); tmp_action=new KAction(i18n("Merge..."),"kdesvnmerge", - KShortcut(),this,SLOT(slotMerge()),m_filesAction,"make_svn_merge"); + KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMerge()),m_filesAction,"make_svn_merge"); tmp_action->setToolTip("Merge repository path into current worky copy path or current repository path into a target"); - tmp_action=new KAction( i18n( "Open With..." ), 0, this, SLOT( slotOpenWith() ), m_filesAction, "openwith" ); + tmp_action=new KAction( i18n( "Open With..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenWith() ), m_filesAction, "openwith" ); /* remote actions only */ m_CheckoutCurrentAction = new KAction(i18n("Checkout current repository path"),"kdesvncheckout",KShortcut(), - m_SvnWrapper,SLOT(slotCheckoutCurrent()),m_filesAction,"make_svn_checkout_current"); + m_SvnWrapper,TQT_SLOT(slotCheckoutCurrent()),m_filesAction,"make_svn_checkout_current"); m_ExportCurrentAction = new KAction(i18n("Export current repository path"),"kdesvnexport",KShortcut(), - m_SvnWrapper,SLOT(slotExportCurrent()),m_filesAction,"make_svn_export_current"); - new KAction(i18n("Select browse revision"),KShortcut(),this,SLOT(slotSelectBrowsingRevision()),m_filesAction,"switch_browse_revision"); + m_SvnWrapper,TQT_SLOT(slotExportCurrent()),m_filesAction,"make_svn_export_current"); + new KAction(i18n("Select browse revision"),KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotSelectBrowsingRevision()),m_filesAction,"switch_browse_revision"); /* independe actions */ m_CheckoutAction = new KAction(i18n("Checkout a repository"),"kdesvncheckout", - KShortcut(),m_SvnWrapper,SLOT(slotCheckout()),m_filesAction,"make_svn_checkout"); + KShortcut(),m_SvnWrapper,TQT_SLOT(slotCheckout()),m_filesAction,"make_svn_checkout"); m_ExportAction = new KAction(i18n("Export a repository"),"kdesvnexport", - KShortcut(),m_SvnWrapper,SLOT(slotExport()),m_filesAction,"make_svn_export"); - m_RefreshViewAction = new KAction(i18n("Refresh view"),"reload",KShortcut(Key_F5),this,SLOT(refreshCurrentTree()),m_filesAction,"make_view_refresh"); + KShortcut(),m_SvnWrapper,TQT_SLOT(slotExport()),m_filesAction,"make_svn_export"); + m_RefreshViewAction = new KAction(i18n("Refresh view"),"reload",KShortcut(Key_F5),TQT_TQOBJECT(this),TQT_SLOT(refreshCurrentTree()),m_filesAction,"make_view_refresh"); - new KAction(i18n("Diff revisions"),"kdesvndiff",KShortcut(),this,SLOT(slotDiffRevisions()),m_filesAction,"make_revisions_diff"); + new KAction(i18n("Diff revisions"),"kdesvndiff",KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDiffRevisions()),m_filesAction,"make_revisions_diff"); /* folding options */ - tmp_action = new KAction( i18n("Unfold File Tree"), 0, this , SLOT(slotUnfoldTree()), m_filesAction, "view_unfold_tree" ); + tmp_action = new KAction( i18n("Unfold File Tree"), 0, TQT_TQOBJECT(this) , TQT_SLOT(slotUnfoldTree()), m_filesAction, "view_unfold_tree" ); tmp_action->setToolTip(i18n("Opens all branches of the file tree")); - tmp_action = new KAction( i18n("Fold File Tree"), 0, this, SLOT(slotFoldTree()), m_filesAction, "view_fold_tree" ); + tmp_action = new KAction( i18n("Fold File Tree"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFoldTree()), m_filesAction, "view_fold_tree" ); tmp_action->setToolTip(i18n("Closes all branches of the file tree")); /* caching */ - tmp_action = new KAction( i18n("Update log cache"),0,this,SLOT(slotUpdateLogCache()),m_filesAction,"update_log_cache" ); + tmp_action = new KAction( i18n("Update log cache"),0,TQT_TQOBJECT(this),TQT_SLOT(slotUpdateLogCache()),m_filesAction,"update_log_cache" ); tmp_action->setToolTip(i18n("Update the log cache for current repository")); - /* tmp_action = new KAction( i18n("Stop update log cache"),0,this,SLOT(slotUpdateLogCache()),m_filesAction,"stop_update_log_cache" ); + /* tmp_action = new KAction( i18n("Stop update log cache"),0,this,TQT_SLOT(slotUpdateLogCache()),m_filesAction,"stop_update_log_cache" ); tmp_action->setToolTip(i18n("Stop the update of the log cache")); */ @@ -461,7 +461,7 @@ KURL::List kdesvnfilelist::selectedUrls() return lst; } -QWidget*kdesvnfilelist::realWidget() +TQWidget*kdesvnfilelist::realWidget() { return this; } @@ -479,7 +479,7 @@ SvnItem*kdesvnfilelist::Selected() return singleSelected(); } -void kdesvnfilelist::_openURL(const QString&url) +void kdesvnfilelist::_openURL(const TQString&url) { openURL(url,true); emit sigUrlChanged(baseUri()); @@ -490,7 +490,7 @@ bool kdesvnfilelist::openURL( const KURL &url,bool noReinit ) CursorStack a; m_SvnWrapper->killallThreads(); clear(); - emit sigProplist(svn::PathPropertiesMapListPtr(new svn::PathPropertiesMapList()),false,QString("")); + emit sigProplist(svn::PathPropertiesMapListPtr(new svn::PathPropertiesMapList()),false,TQString("")); m_Dirsread.clear(); if (m_SelectedItems) { m_SelectedItems->clear(); @@ -503,15 +503,15 @@ bool kdesvnfilelist::openURL( const KURL &url,bool noReinit ) if (!noReinit) m_SvnWrapper->reInitClient(); - QString query = url.query(); + TQString query = url.query(); KURL _url = url; - QString proto = svn::Url::transformProtokoll(url.protocol()); + TQString proto = svn::Url::transformProtokoll(url.protocol()); _url.cleanPath(true); _url.setProtocol(proto); proto = _url.url(-1); - QStringList s = QStringList::split("?",proto); + TQStringList s = TQStringList::split("?",proto); if (s.size()>1) { setBaseUri(s[0]); } else { @@ -523,19 +523,19 @@ bool kdesvnfilelist::openURL( const KURL &url,bool noReinit ) m_pList->m_remoteRevision=svn::Revision::HEAD; - QString _dummy; + TQString _dummy; - if (!QString::compare("svn+file",url.protocol())) { + if (!TQString::compare("svn+file",url.protocol())) { setBaseUri("file://"+url.path()); } else { if (url.isLocalFile()) { - QString s = url.path(); + TQString s = url.path(); while(s.endsWith("/")) { s.remove(s.length()-1,1); } - QFileInfo fi(s); + TQFileInfo fi(s); if (fi.exists() && fi.isSymLink()) { - QString sl = fi.readLink(); + TQString sl = fi.readLink(); if (sl.startsWith("/")) { setBaseUri(sl); } else { @@ -567,9 +567,9 @@ bool kdesvnfilelist::openURL( const KURL &url,bool noReinit ) } } if (query.length()>1) { - QMap q = url.queryItems(); - if (q.find("rev")!=q.end()) { - QString v = q["rev"]; + TQMap q = url.queryItems(); + if (q.tqfind("rev")!=q.end()) { + TQString v = q["rev"]; svn::Revision tmp; m_SvnWrapper->svnclient()->url2Revision(v,m_pList->m_remoteRevision,tmp); if (m_pList->m_remoteRevision==svn::Revision::UNDEFINED) { @@ -585,10 +585,10 @@ bool kdesvnfilelist::openURL( const KURL &url,bool noReinit ) } m_SvnWrapper->clearUpdateCache(); if (isWorkingCopy()) { - m_pList->m_DirWatch=new KDirWatch(this); - connect(m_pList->m_DirWatch,SIGNAL(dirty(const QString&)),this,SLOT(slotDirItemDirty(const QString&))); - connect(m_pList->m_DirWatch,SIGNAL(created(const QString&)),this,SLOT(slotDirItemCreated(const QString&))); - connect(m_pList->m_DirWatch,SIGNAL(deleted(const QString&)),this,SLOT(slotDirItemDeleted(const QString&))); + m_pList->m_DirWatch=new KDirWatch(TQT_TQOBJECT(this)); + connect(m_pList->m_DirWatch,TQT_SIGNAL(dirty(const TQString&)),this,TQT_SLOT(slotDirItemDirty(const TQString&))); + connect(m_pList->m_DirWatch,TQT_SIGNAL(created(const TQString&)),this,TQT_SLOT(slotDirItemCreated(const TQString&))); + connect(m_pList->m_DirWatch,TQT_SIGNAL(deleted(const TQString&)),this,TQT_SLOT(slotDirItemDeleted(const TQString&))); /* seems that recursive does not work */ if (m_pList->m_DirWatch) { m_pList->m_DirWatch->addDir(baseUri()+"/",false,false); @@ -606,7 +606,7 @@ bool kdesvnfilelist::openURL( const KURL &url,bool noReinit ) clear(); } m_pList->m_fileTip->setOptions(!isNetworked()&&Kdesvnsettings::display_file_tips()&& - QToolTip::isGloballyEnabled(),true,6); + TQToolTip::isGloballyEnabled(),true,6); if (result && isWorkingCopy()) { m_SvnWrapper->createModifiedCache(baseUri()); @@ -620,7 +620,7 @@ bool kdesvnfilelist::openURL( const KURL &url,bool noReinit ) } emit changeCaption(baseUri()); emit sigUrlOpend(result); - QTimer::singleShot(1,this,SLOT(readSupportData())); + TQTimer::singleShot(1,this,TQT_SLOT(readSupportData())); enableActions(); return result; } @@ -646,28 +646,28 @@ void kdesvnfilelist::closeMe() m_pList->m_fileTip->setItem(0); } -bool kdesvnfilelist::checkDirs(const QString&_what,FileListViewItem * _parent) +bool kdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _tqparent) { - QString what = _what; + TQString what = _what; svn::StatusEntries dlist; while (what.endsWith("/")) { what.truncate(what.length()-1); } // prevent this from checking unversioned folder. FIXME: what happen when we do open url on a non-working-copy folder?? - if (!isWorkingCopy()|| (!_parent) || ((_parent) && (_parent->isVersioned()))) { - if (!m_SvnWrapper->makeStatus(what,dlist,m_pList->m_remoteRevision) ) { - kdDebug() << "unable makeStatus" <isVersioned()))) { + if (!m_SvnWrapper->maketqStatus(what,dlist,m_pList->m_remoteRevision) ) { + kdDebug() << "unable maketqStatus" <getaddedItems(what,neweritems); dlist+=neweritems; bool ownupdates = true; - //kdDebug() << "makeStatus on " << what << " created: " << dlist.count() << "items" <setUpdatesEnabled(false); @@ -682,15 +682,15 @@ bool kdesvnfilelist::checkDirs(const QString&_what,FileListViewItem * _parent) // current item is not versioned if (!(*it)->isVersioned() && !filterOut((*it))) { - // if empty, we may want to create a default svn::Status for each folder inside this _parent - // iterate over QDir and create new filelistviewitem - checkUnversionedDirs(_parent); + // if empty, we may want to create a default svn::tqStatus for each folder inside this _tqparent + // iterate over TQDir and create new filelistviewitem + checkUnversionedDirs(_tqparent); } - if ((*it)->path()==what||QString::compare((*it)->entry().url(),what)==0){ - if (!_parent) { + if ((*it)->path()==what||TQString::compare((*it)->entry().url(),what)==0){ + if (!_tqparent) { pitem = new FileListViewItem(this,*it); - //kdDebug()<< "CheckDirs::creating new FileListViewitem as parent " + (*it)->path() << endl; + //kdDebug()<< "CheckDirs::creating new FileListViewitem as tqparent " + (*it)->path() << endl; m_Dirsread[pitem->fullName()]=true; pitem->setDropEnabled(true); } @@ -699,31 +699,31 @@ bool kdesvnfilelist::checkDirs(const QString&_what,FileListViewItem * _parent) break; } } - if (_parent) { - pitem = _parent; + if (_tqparent) { + pitem = _tqparent; } insertDirs(pitem,dlist); if (ownupdates) { kdDebug()<<"Enable update"<setUpdatesEnabled(true); - viewport()->repaint(); + viewport()->tqrepaint(); } return true; } -void kdesvnfilelist::insertDirs(FileListViewItem * _parent,svn::StatusEntries&dlist) +void kdesvnfilelist::insertDirs(FileListViewItem * _tqparent,svn::StatusEntries&dlist) { svn::StatusEntries::iterator it; #if 0 KFileItemList oneItem; #endif - QTime _t; + TQTime _t; _t.start(); for (it = dlist.begin();it!=dlist.end();++it) { /* if (_t.elapsed()>300) { viewport()->setUpdatesEnabled(true); - viewport()->repaint(); + viewport()->tqrepaint(); viewport()->setUpdatesEnabled(false); _t.restart(); }*/ @@ -732,13 +732,13 @@ void kdesvnfilelist::insertDirs(FileListViewItem * _parent,svn::StatusEntries&dl continue; } FileListViewItem * item; - if (!_parent) { + if (!_tqparent) { item = new FileListViewItem(this,*it); } else { - if ( (item = _parent->findChild( (*it)->path() )) ) { + if ( (item = _tqparent->findChild( (*it)->path() )) ) { delete item; } - item = new FileListViewItem(this,_parent,*it); + item = new FileListViewItem(this,_tqparent,*it); } if (item->isDir()) { m_Dirsread[item->fullName()]=false; @@ -753,10 +753,10 @@ void kdesvnfilelist::insertDirs(FileListViewItem * _parent,svn::StatusEntries&dl } /* newdir is the NEW directory! just required if local */ -void kdesvnfilelist::slotDirAdded(const QString&newdir,FileListViewItem*k) +void kdesvnfilelist::slotDirAdded(const TQString&newdir,FileListViewItem*k) { if (k) { - k->refreshStatus(); + k->refreshtqStatus(); } if (!isWorkingCopy()) { if (k) { @@ -769,7 +769,7 @@ void kdesvnfilelist::slotDirAdded(const QString&newdir,FileListViewItem*k) } return; } - QListViewItem*temp; + TQListViewItem*temp; while ((temp=firstChild())) { delete temp; } @@ -779,7 +779,7 @@ void kdesvnfilelist::slotDirAdded(const QString&newdir,FileListViewItem*k) } svn::StatusPtr stat; try { - stat = m_SvnWrapper->svnclient()->singleStatus(newdir); + stat = m_SvnWrapper->svnclient()->singletqStatus(newdir); } catch (const svn::ClientException&e) { m_LastException = e.msg(); kdDebug()<<"Catched on singlestatus"<< endl; @@ -818,20 +818,20 @@ kdesvnfilelist::~kdesvnfilelist() ssh.killSshAgent(); } -void kdesvnfilelist::slotItemRead(QListViewItem*aItem) +void kdesvnfilelist::slotItemRead(TQListViewItem*aItem) { if (!aItem) return; - CursorStack a(Qt::BusyCursor); + CursorStack a(TQt::BusyCursor); FileListViewItem* k = static_cast( aItem ); bool _ex = true; if (isWorkingCopy()) { - QDir d(k->fullName()); //FIXME: remove this as soon as we've been able to set entry->kind in Checkdirs + TQDir d(k->fullName()); //FIXME: remove this as soon as we've been able to set entry->kind in Checkdirs _ex = k->isDir()||d.exists(); } else { _ex = k->isDir(); } - if (_ex &&(m_Dirsread.find(k->fullName())==m_Dirsread.end()||m_Dirsread[k->fullName()]==false)) { + if (_ex &&(m_Dirsread.tqfind(k->fullName())==m_Dirsread.end()||m_Dirsread[k->fullName()]==false)) { if (checkDirs(k->fullName(),k)) { m_Dirsread[k->fullName()]=true; } else { @@ -912,7 +912,7 @@ void kdesvnfilelist::enableActions() m_DelCurrent->setEnabled( (multi||single)); m_LockAction->setEnabled( (multi||single)); m_UnlockAction->setEnabled( (multi||single)); - m_IgnoreAction->setEnabled((single)&&singleSelected()->parent()!=0&&!singleSelected()->isRealVersioned()); + m_IgnoreAction->setEnabled((single)&&singleSelected()->tqparent()!=0&&!singleSelected()->isRealVersioned()); m_RenameAction->setEnabled(single && (!isWorkingCopy()||singleSelected()!=firstChild())); m_CopyAction->setEnabled(single && (!isWorkingCopy()||singleSelected()!=firstChild())); @@ -1026,7 +1026,7 @@ void kdesvnfilelist::slotSelectionChanged() } m_SelectedItems->clear(); - QListViewItemIterator it( this, QListViewItemIterator::Selected ); + TQListViewItemIterator it( this, TQListViewItemIterator::Selected ); while ( it.current() ) { m_SelectedItems->append( static_cast(it.current()) ); ++it; @@ -1036,22 +1036,22 @@ void kdesvnfilelist::slotSelectionChanged() } /*! - \fn kdesvnfilelist::slotClientException(const QString&) + \fn kdesvnfilelist::slotClientException(const TQString&) */ -void kdesvnfilelist::slotClientException(const QString&what) +void kdesvnfilelist::slotClientException(const TQString&what) { emit sigLogMessage(what); - KMessageBox::sorry(KApplication::activeModalWidget(),what,i18n("SVN Error")); + KMessageBox::sorry(TQT_TQWIDGET(KApplication::activeModalWidget()),what,i18n("SVN Error")); } /*! - \fn kdesvnfilelist::slotNotifyMessage(const QString&) + \fn kdesvnfilelist::slotNotifyMessage(const TQString&) */ -void kdesvnfilelist::slotNotifyMessage(const QString&what) +void kdesvnfilelist::slotNotifyMessage(const TQString&what) { emit sigLogMessage(what); - kapp->processEvents(20); + kapp->tqprocessEvents(20); } void kdesvnfilelist::slotChangeToRepository() @@ -1067,13 +1067,13 @@ void kdesvnfilelist::slotChangeToRepository() return; } if (i.reposRoot().isEmpty()) { - KMessageBox::sorry(KApplication::activeModalWidget(),i18n("Could not retrieve repository of working copy."),i18n("SVN Error")); + KMessageBox::sorry(TQT_TQWIDGET(KApplication::activeModalWidget()),i18n("Could not retrieve repository of working copy."),i18n("SVN Error")); } else { sigSwitchUrl(i.reposRoot()); } } -void kdesvnfilelist::slotItemDoubleClicked(QListViewItem*item) +void kdesvnfilelist::slotItemDoubleClicked(TQListViewItem*item) { if (!item) return; @@ -1087,7 +1087,7 @@ void kdesvnfilelist::slotItemDoubleClicked(QListViewItem*item) return; } svn::Revision rev(isWorkingCopy()?svn::Revision::UNDEFINED:m_pList->m_remoteRevision); - QString feditor = Kdesvnsettings::external_display(); + TQString feditor = Kdesvnsettings::external_display(); if ( feditor.compare("default") == 0 ) { KURL::List lst; lst.append(fki->kdeName(rev)); @@ -1103,7 +1103,7 @@ void kdesvnfilelist::slotItemDoubleClicked(QListViewItem*item) } } else { if ( KRun::runCommand(feditor + " " + fki->kdeName(rev).prettyURL()) <= 0) { - KMessageBox::error(this,i18n("Failed: %1 %2").arg(feditor).arg(fki->fullName())); + KMessageBox::error(this,i18n("Failed: %1 %2").tqarg(feditor).tqarg(fki->fullName())); } } } @@ -1115,7 +1115,7 @@ void kdesvnfilelist::slotCleanupAction() if (!which) which = static_cast(firstChild()); if (!which||!which->isDir()) return; if (m_SvnWrapper->makeCleanup(which->fullName())) { - which->refreshStatus(true); + which->refreshtqStatus(true); } } @@ -1126,7 +1126,7 @@ void kdesvnfilelist::slotResolved() if (!which) which = static_cast(firstChild()); if (!which) return; m_SvnWrapper->slotResolved(which->fullName()); - which->refreshStatus(true); + which->refreshtqStatus(true); slotRescanIcons(false); } @@ -1140,7 +1140,7 @@ void kdesvnfilelist::slotTryResolve() m_SvnWrapper->slotResolve(which->fullName()); } -template KDialogBase* kdesvnfilelist::createDialog(T**ptr,const QString&_head,bool OkCancel,const char*name,bool showHelp) +template KDialogBase* kdesvnfilelist::createDialog(T**ptr,const TQString&_head,bool OkCancel,const char*name,bool showHelp) { int buttons = KDialogBase::Ok; if (OkCancel) { @@ -1150,14 +1150,14 @@ template KDialogBase* kdesvnfilelist::createDialog(T**ptr,const QString buttons = buttons|KDialogBase::Help; } KDialogBase * dlg = new KDialogBase( - KApplication::activeModalWidget(), + TQT_TQWIDGET(TQT_TQWIDGET(KApplication::activeModalWidget())), name, true, _head, buttons); if (!dlg) return dlg; - QWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); *ptr = new T(Dialog1Layout); dlg->resize(dlg->configDialogSize(*(Kdesvnsettings::self()->config()),name?name:"standard_size")); return dlg; @@ -1177,15 +1177,15 @@ void kdesvnfilelist::slotImportIntoCurrent(bool dirs) KMessageBox::error(this,i18n("Cannot import into multiple targets!")); return; } - QString targetUri; + TQString targetUri; if (allSelected()->count()==0) { targetUri=baseUri(); } else { targetUri = allSelected()->at(0)->Url(); } KURL uri; - if (dirs) uri = KFileDialog::getExistingDirectory(QString::null,this,"Import files from folder"); - else uri = KFileDialog::getImageOpenURL(QString::null,this,"Import file"); + if (dirs) uri = KFileDialog::getExistingDirectory(TQString(),this,"Import files from folder"); + else uri = KFileDialog::getImageOpenURL(TQString(),this,"Import file"); if (uri.url().isEmpty()) return; @@ -1196,30 +1196,30 @@ void kdesvnfilelist::slotImportIntoCurrent(bool dirs) slotImportIntoDir(uri,targetUri,dirs); } -void kdesvnfilelist::slotImportIntoDir(const KURL&importUrl,const QString&target,bool dirs) +void kdesvnfilelist::slotImportIntoDir(const KURL&importUrl,const TQString&target,bool dirs) { Logmsg_impl*ptr; Importdir_logmsg*ptr2 = 0; KDialogBase*dlg; KURL uri = importUrl; - QString targetUri = target; + TQString targetUri = target; while (targetUri.endsWith("/")) { targetUri.truncate(targetUri.length()-1); } if (dirs) { - dlg = createDialog(&ptr2,QString(i18n("Import log")),true,"import_log_msg"); + dlg = createDialog(&ptr2,TQString(i18n("Import log")),true,"import_log_msg"); ptr = ptr2; ptr2->createDirboxDir("\""+uri.fileName(true)+"\""); } else { - dlg = createDialog(&ptr,QString(i18n("Import log")),true,"import_log_msg"); + dlg = createDialog(&ptr,TQString(i18n("Import log")),true,"import_log_msg"); } if (!dlg) return; ptr->initHistory(); - if (dlg->exec()!=QDialog::Accepted) { + if (dlg->exec()!=TQDialog::Accepted) { ptr->saveHistory(true); dlg->saveDialogSize(*(Kdesvnsettings::self()->config()),"import_log_msg",false); delete dlg; @@ -1227,11 +1227,11 @@ void kdesvnfilelist::slotImportIntoDir(const KURL&importUrl,const QString&target } dlg->saveDialogSize(*(Kdesvnsettings::self()->config()),"import_log_msg",false); - QString logMessage = ptr->getMessage(); + TQString logMessage = ptr->getMessage(); svn::Depth rec = ptr->getDepth(); ptr->saveHistory(false); uri.setProtocol(""); - QString iurl = uri.path(); + TQString iurl = uri.path(); while (iurl.endsWith("/")) { iurl.truncate(iurl.length()-1); } @@ -1262,7 +1262,7 @@ void kdesvnfilelist::readSupportData() void kdesvnfilelist::refreshCurrentTree() { - QTime t; + TQTime t; t.start(); FileListViewItem*item = static_cast(firstChild()); if (!item) return; @@ -1273,7 +1273,7 @@ void kdesvnfilelist::refreshCurrentTree() if (item->fullName()==baseUri()) { if (!refreshItem(item)) { setUpdatesEnabled(true); - viewport()->repaint(); + viewport()->tqrepaint(); return; } else { refreshRecursive(item); @@ -1286,8 +1286,8 @@ void kdesvnfilelist::refreshCurrentTree() } kdDebug()<<"Refresh time: "<repaint(); - QTimer::singleShot(1,this,SLOT(readSupportData())); + viewport()->tqrepaint(); + TQTimer::singleShot(1,this,TQT_SLOT(readSupportData())); //m_pList->startScan(); } @@ -1301,14 +1301,14 @@ void kdesvnfilelist::refreshCurrent(SvnItem*cur) setUpdatesEnabled(false); refreshRecursive(cur->fItem()); setUpdatesEnabled(true); - viewport()->repaint(); + viewport()->tqrepaint(); } -bool kdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) +bool kdesvnfilelist::refreshRecursive(FileListViewItem*_tqparent,bool down) { FileListViewItem*item; - if (_parent) { - item = static_cast(_parent->firstChild()); + if (_tqparent) { + item = static_cast(_tqparent->firstChild()); } else { item = static_cast(firstChild()); } @@ -1324,10 +1324,10 @@ bool kdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) item = static_cast(item->nextSibling()); } - QString what = (_parent!=0?_parent->fullName():baseUri()); + TQString what = (_tqparent!=0?_tqparent->fullName():baseUri()); svn::StatusEntries dlist; - if (!m_SvnWrapper->makeStatus(what,dlist,m_pList->m_remoteRevision)) { + if (!m_SvnWrapper->maketqStatus(what,dlist,m_pList->m_remoteRevision)) { kdDebug()<<"Fehler bei makestatus fuer "<fullName()==(*it)->path()) { currentSync.removeRef(k); - k->updateStatus(*it); + k->updatetqStatus(*it); if (filterOut(k)) { dispchanged=true; delete k; @@ -1363,10 +1363,10 @@ bool kdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) if (!gotit &&!filterOut((*it)) ) { dispchanged = true; FileListViewItem * item; - if (!_parent) { + if (!_tqparent) { item = new FileListViewItem(this,*it); } else { - item = new FileListViewItem(this,_parent,*it); + item = new FileListViewItem(this,_tqparent,*it); } if (item->isDir()) { m_Dirsread[item->fullName()]=false; @@ -1392,7 +1392,7 @@ bool kdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) // @todo just for debugging! #ifndef NDEBUG m_SelectedItems->clear(); - QListViewItemIterator qlvit( this, QListViewItemIterator::Selected ); + TQListViewItemIterator qlvit( this, TQListViewItemIterator::Selected ); while ( qlvit.current() ) { m_SelectedItems->append( static_cast(qlvit.current()) ); ++qlvit; @@ -1400,8 +1400,8 @@ bool kdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) kdDebug() << "Selected items " << m_SelectedItems->count() << endl; #endif } - if (_parent) { - item = static_cast(_parent->firstChild()); + if (_tqparent) { + item = static_cast(_tqparent->firstChild()); } else { item = static_cast(firstChild()); } @@ -1410,7 +1410,7 @@ bool kdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) } while (item) { if (item->isDir()) { - if ((m_Dirsread.find(item->fullName())!=m_Dirsread.end()&&m_Dirsread[item->fullName()]==true)) { + if ((m_Dirsread.tqfind(item->fullName())!=m_Dirsread.end()&&m_Dirsread[item->fullName()]==true)) { if (item->childCount()==0) { checkDirs(item->fullName(),item); dispchanged = true; @@ -1430,7 +1430,7 @@ KTrader::OfferList kdesvnfilelist::offersList(SvnItem*item,bool execOnly) if (!item) { return offers; } - QString constraint; + TQString constraint; if (execOnly) { constraint = "Type == 'Application' or (exist Exec)"; } else { @@ -1441,14 +1441,14 @@ KTrader::OfferList kdesvnfilelist::offersList(SvnItem*item,bool execOnly) return offers; } -void kdesvnfilelist::slotContextMenuRequested(QListViewItem */* _item */, const QPoint &, int) +void kdesvnfilelist::slotContextMenuRequested(TQListViewItem */* _item */, const TQPoint &, int) { // FileListViewItem*item = static_cast(_item); bool isopen = baseUri().length()>0; SvnItemList l; SelectionList(&l); - QString menuname; + TQString menuname; if (!isopen) { menuname="empty"; @@ -1481,9 +1481,9 @@ void kdesvnfilelist::slotContextMenuRequested(QListViewItem */* _item */, const } } - QWidget * target; + TQWidget * target; emit sigShowPopup(menuname,&target); - QPopupMenu *popup = static_cast(target); + TQPopupMenu *popup = static_cast(target); if (!popup) { kdDebug()<<"Error getting popupMenu"<exec(QCursor::pos()); + popup->exec(TQCursor::pos()); if (id>-1) { popup->removeItem(id); } @@ -1521,11 +1521,11 @@ void kdesvnfilelist::slotContextMenuRequested(QListViewItem */* _item */, const } /** -* Overridden virtuals for Qt drag 'n drop (XDND) +* Overridden virtuals for TQt drag 'n drop (XDND) */ -void kdesvnfilelist::contentsDragEnterEvent(QDragEnterEvent *event) +void kdesvnfilelist::contentsDragEnterEvent(TQDragEnterEvent *event) { - QListViewItem*item; + TQListViewItem*item; bool ok = validDropEvent(event,item); if (ok) { event->accept(); @@ -1535,14 +1535,14 @@ void kdesvnfilelist::contentsDragEnterEvent(QDragEnterEvent *event) } //void kdesvnfilelist::startDrag() -QDragObject* kdesvnfilelist::dragObject() +TQDragObject* kdesvnfilelist::dragObject() { m_pList->m_fileTip->setItem(0); - QListViewItem * m_pressedItem = currentItem(); + TQListViewItem * m_pressedItem = currentItem(); if (!m_pressedItem) { return 0; } - QPixmap pixmap2; + TQPixmap pixmap2; KURL::List urls = selectedUrls(); if (urls.count()==0) { return 0; @@ -1567,8 +1567,8 @@ QDragObject* kdesvnfilelist::dragObject() /* workaround for KURL::Drag - it always forget the revision part on drop :( */ if (!isWorkingCopy()) { - QStrList l; - QString t; + TQStrList l; + TQString t; KURL::List::ConstIterator it = urls.begin(); for (;it!=urls.end();++it) { l.append((*it).prettyURL()); @@ -1585,17 +1585,17 @@ QDragObject* kdesvnfilelist::dragObject() return drag; } -void kdesvnfilelist::contentsDragLeaveEvent( QDragLeaveEvent * ) +void kdesvnfilelist::contentsDragLeaveEvent( TQDragLeaveEvent * ) { cleanHighLighter(); } -bool kdesvnfilelist::acceptDrag(QDropEvent *event)const +bool kdesvnfilelist::acceptDrag(TQDropEvent *event)const { return KURLDrag::canDecode(event); } -bool kdesvnfilelist::validDropEvent(QDropEvent*event,QListViewItem*&item) +bool kdesvnfilelist::validDropEvent(TQDropEvent*event,TQListViewItem*&item) { if (!event) return false; if (!isWorkingCopy()) { @@ -1614,7 +1614,7 @@ bool kdesvnfilelist::validDropEvent(QDropEvent*event,QListViewItem*&item) if (baseUri().length()==0) { ok = true; } else { - QPoint vp = contentsToViewport( event->pos() ); + TQPoint vp = contentsToViewport( event->pos() ); item = isExecuteArea( vp ) ? itemAt( vp ) : 0L; FileListViewItem*which=static_cast(item); if (!isWorkingCopy()) { @@ -1632,9 +1632,9 @@ bool kdesvnfilelist::validDropEvent(QDropEvent*event,QListViewItem*&item) return ok; } -void kdesvnfilelist::contentsDropEvent(QDropEvent * event) +void kdesvnfilelist::contentsDropEvent(TQDropEvent * event) { - QListViewItem *item = 0; + TQListViewItem *item = 0; bool ok = validDropEvent(event,item); cleanHighLighter(); if (ok) { @@ -1644,20 +1644,20 @@ void kdesvnfilelist::contentsDropEvent(QDropEvent * event) } } -void kdesvnfilelist::contentsDragMoveEvent( QDragMoveEvent* event) +void kdesvnfilelist::contentsDragMoveEvent( TQDragMoveEvent* event) { - QListViewItem * item; + TQListViewItem * item; bool ok = validDropEvent(event,item); if (item && item!=m_pList->dragOverItem) { - QPoint vp = contentsToViewport( event->pos() ); + TQPoint vp = contentsToViewport( event->pos() ); m_pList->dragOverItem=item; m_pList->dragOverPoint = vp; - QRect tmpRect = drawItemHighlighter(0, m_pList->dragOverItem); + TQRect tmpRect = drawItemHighlighter(0, m_pList->dragOverItem); if (tmpRect!=m_pList->mOldDropHighlighter) { cleanHighLighter(); m_pList->mOldDropHighlighter=tmpRect; - viewport()->repaint(tmpRect); + viewport()->tqrepaint(tmpRect); kapp->processEvents(); } } @@ -1668,22 +1668,22 @@ void kdesvnfilelist::contentsDragMoveEvent( QDragMoveEvent* event) } } -void kdesvnfilelist::viewportPaintEvent(QPaintEvent *ev) +void kdesvnfilelist::viewportPaintEvent(TQPaintEvent *ev) { KListView::viewportPaintEvent(ev); if (m_pList->mOldDropHighlighter.isValid() && ev->rect().intersects(m_pList->mOldDropHighlighter)) { - QPainter painter(viewport()); - style().drawPrimitive(QStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, colorGroup(), - QStyle::Style_FocusAtBorder); + TQPainter painter(viewport()); + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, tqcolorGroup(), + TQStyle::Style_FocusAtBorder); } } void kdesvnfilelist::cleanHighLighter() { if (m_pList->mOldDropHighlighter.isValid()) { - QRect rect=m_pList->mOldDropHighlighter; - m_pList->mOldDropHighlighter=QRect(); - viewport()->repaint(rect, true); + TQRect rect=m_pList->mOldDropHighlighter; + m_pList->mOldDropHighlighter=TQRect(); + viewport()->tqrepaint(rect, true); } } @@ -1715,7 +1715,7 @@ void kdesvnfilelist::slotMergeRevisions() void kdesvnfilelist::slotMerge() { FileListViewItem*which= singleSelected(); - QString src1,src2,target; + TQString src1,src2,target; if (isWorkingCopy()) { if (m_pList->merge_Target.isEmpty()) { target = which?which->fullName():baseUri(); @@ -1735,7 +1735,7 @@ void kdesvnfilelist::slotMerge() bool force,dry,rec,irelated,useExternal; Rangeinput_impl::revision_range range; MergeDlg_impl*ptr; - KDialogBase*dlg = createDialog(&ptr,QString(i18n("Merge")),true,"merge_dialog",true); + KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Merge")),true,"merge_dialog",true); if (!dlg) { return; } @@ -1743,7 +1743,7 @@ void kdesvnfilelist::slotMerge() ptr->setDest(target); ptr->setSrc1(src1); ptr->setSrc2(src1); - if (dlg->exec()==QDialog::Accepted) { + if (dlg->exec()==TQDialog::Accepted) { src1=ptr->Src1(); src2=ptr->Src2(); if (src2.isEmpty()) { @@ -1779,16 +1779,16 @@ void kdesvnfilelist::slotMerge() delete dlg; } -void kdesvnfilelist::slotDropped(QDropEvent* event,QListViewItem*item) +void kdesvnfilelist::slotDropped(TQDropEvent* event,TQListViewItem*item) { KURL::List urlList; - QMap metaData; - QDropEvent::Action action = event->action(); + TQMap metaData; + TQDropEvent::Action action = event->action(); if (!event || m_pList->intern_dropRunning||!KURLDrag::decode( event, urlList, metaData)||urlList.count()<1) { return; } kdDebug()<<"slotDropped"<(item); clearSelection(); @@ -1807,15 +1807,15 @@ void kdesvnfilelist::slotDropped(QDropEvent* event,QListViewItem*item) return; } if (baseUri().length()>0 /*&& urlList[0].isLocalFile()*/) { - QString path = urlList[0].path(); - QFileInfo fi(path); + TQString path = urlList[0].path(); + TQFileInfo fi(path); if (!isWorkingCopy()) { slotImportIntoDir(urlList[0],tdir,fi.isDir()); } else { //m_pList->stopScan(); KIO::Job * job = 0L; job = KIO::copy(urlList,tdir); - connect( job, SIGNAL( result( KIO::Job * ) ),SLOT( slotCopyFinished( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ),TQT_SLOT( slotCopyFinished( KIO::Job * ) ) ); dispDummy(); event->acceptAction(); return; @@ -1825,26 +1825,26 @@ void kdesvnfilelist::slotDropped(QDropEvent* event,QListViewItem*item) kdDebug()<<"Dropped from inside " << action << endl; int root_x, root_y, win_x, win_y; uint keybstate; - QDropEvent::Action action = QDropEvent::UserAction; + TQDropEvent::Action action = TQDropEvent::UserAction; KeyState::keystate(&root_x,&root_y,&win_x,&win_y,&keybstate); - if (keybstate&Qt::ControlButton) { + if (keybstate&TQt::ControlButton) { kdDebug()<<"Control pressed" << endl; - action = QDropEvent::Copy; - } else if (keybstate&Qt::ShiftButton) { + action = TQDropEvent::Copy; + } else if (keybstate&TQt::ShiftButton) { kdDebug()<<"Shift pressed" << endl; - action = QDropEvent::Move; + action = TQDropEvent::Move; } /* converting urls to interal style */ - QString nProto; + TQString nProto; if (isWorkingCopy()) { nProto=""; } else { nProto = svn::Url::transformProtokoll(urlList[0].protocol()); } KURL::List::Iterator it = urlList.begin(); - QStringList l; + TQStringList l; for (;it!=urlList.end();++it) { - l = QStringList::split("?",(*it).prettyURL()); + l = TQStringList::split("?",(*it).prettyURL()); if (l.size()>1) { (*it) = l[0]; } else if (isWorkingCopy()) @@ -1859,8 +1859,8 @@ void kdesvnfilelist::slotDropped(QDropEvent* event,QListViewItem*item) m_pList->intern_drops = urlList; m_pList->intern_drop_target=tdir; m_pList->intern_drop_action=action; - m_pList->intern_drop_pos=QCursor::pos(); - QTimer::singleShot(0,this,SLOT(slotInternalDrop())); + m_pList->intern_drop_pos=TQCursor::pos(); + TQTimer::singleShot(0,this,TQT_SLOT(slotInternalDrop())); // internalDrop(action,urlList,tdir); } @@ -1868,17 +1868,17 @@ void kdesvnfilelist::slotDropped(QDropEvent* event,QListViewItem*item) void kdesvnfilelist::slotInternalDrop() { - QDropEvent::Action action = m_pList->intern_drop_action; - if (action==QDropEvent::UserAction) { - QPopupMenu popup; + TQDropEvent::Action action = m_pList->intern_drop_action; + if (action==TQDropEvent::UserAction) { + TQPopupMenu popup; popup.insertItem(SmallIconSet("goto"), i18n( "Move Here" ) + "\t" + KKey::modFlagLabel( KKey::SHIFT ), 2 ); popup.insertItem(SmallIconSet("editcopy"), i18n( "Copy Here" ) + "\t" + KKey::modFlagLabel( KKey::CTRL ), 1 ); popup.insertSeparator(); - popup.insertItem(SmallIconSet("cancel"), i18n( "Cancel" ) + "\t" + KKey( Qt::Key_Escape ).toString(), 5); + popup.insertItem(SmallIconSet("cancel"), i18n( "Cancel" ) + "\t" + KKey( TQt::Key_Escape ).toString(), 5); int result = popup.exec(m_pList->intern_drop_pos); switch (result) { - case 1 : action = QDropEvent::Copy; break; - case 2 : action = QDropEvent::Move; break; + case 1 : action = TQDropEvent::Copy; break; + case 2 : action = TQDropEvent::Move; break; default: { m_pList->intern_dropRunning=false; @@ -1886,7 +1886,7 @@ void kdesvnfilelist::slotInternalDrop() } } } - if (action==QDropEvent::Move) { + if (action==TQDropEvent::Move) { m_SvnWrapper->makeMove(m_pList->intern_drops,m_pList->intern_drop_target,false); } else { m_SvnWrapper->makeCopy(m_pList->intern_drops,m_pList->intern_drop_target,svn::Revision::HEAD); @@ -1915,7 +1915,7 @@ void kdesvnfilelist::copy_move(bool move) bool ok, force; FileListViewItem*which = singleSelected(); if (!which) return; - QString nName = CopyMoveView_impl::getMoveCopyTo(&ok,&force,move, + TQString nName = CopyMoveView_impl::getMoveCopyTo(&ok,&force,move, which->fullName(),baseUri(),this,"move_name"); if (!ok) { return; @@ -1946,7 +1946,7 @@ void kdesvnfilelist::slotCopyFinished( KIO::Job * job) } if (job) { bool ok = true; - qApp->exit_loop(); + tqApp->exit_loop(); if (job->error()) { job->showErrorDialog(this); ok = false; @@ -1955,9 +1955,9 @@ void kdesvnfilelist::slotCopyFinished( KIO::Job * job) if (ok) { KURL::List lst = static_cast(job)->srcURLs(); KURL turl = static_cast(job)->destURL(); - QString base = turl.path(1); + TQString base = turl.path(1); KURL::List::iterator iter; - QValueList tmp; + TQValueList tmp; for (iter=lst.begin();iter!=lst.end();++iter) { tmp.push_back(svn::Path((base+(*iter).fileName(true)))); } @@ -1975,7 +1975,7 @@ void kdesvnfilelist::slotCopyFinished( KIO::Job * job) void kdesvnfilelist::slotDelete() { m_deletePerfect = true; - QPtrList*lst = allSelected(); + TQPtrList*lst = allSelected(); if (lst->count()==0) { KMessageBox::error(this,i18n("Nothing selected for delete")); @@ -1986,8 +1986,8 @@ void kdesvnfilelist::slotDelete() //m_pList->stopScan(); m_pList->m_fileTip->setItem(0); - QValueList items; - QStringList displist; + TQValueList items; + TQStringList displist; KURL::List kioList; while ((cur=liter.current())!=0){ ++liter; @@ -2005,7 +2005,7 @@ void kdesvnfilelist::slotDelete() } if (kioList.count()>0) { KIO::Job*aJob = KIO::del(kioList); - connect(aJob,SIGNAL(result (KIO::Job *)),this,SLOT(slotDeleteFinished(KIO::Job*))); + connect(aJob,TQT_SIGNAL(result (KIO::Job *)),this,TQT_SLOT(slotDeleteFinished(KIO::Job*))); dispDummy(); } if (m_deletePerfect && items.size()>0) { @@ -2021,7 +2021,7 @@ void kdesvnfilelist::slotDelete() void kdesvnfilelist::slotDeleteFinished(KIO::Job*job) { if (job) { - qApp->exit_loop(); + tqApp->exit_loop(); if (job->error()) { job->showErrorDialog(this); m_deletePerfect = false; @@ -2035,15 +2035,15 @@ void kdesvnfilelist::slotDeleteFinished(KIO::Job*job) void kdesvnfilelist::dispDummy() { // wait for job - QLabel dummy(this,0,WStyle_NoBorder|WShowModal); - QSize csize = size(); + TQLabel dummy(this,0,WStyle_NoBorder|WShowModal); + TQSize csize = size(); dummy.setText(i18n("Please wait until job is finished")); - dummy.resize(dummy.minimumSizeHint()); + dummy.resize(dummy.tqminimumSizeHint()); if (dummy.width()<=width()&&dummy.height()<=height()) { dummy.move(csize.width()/2-dummy.width()/2,csize.height()/2-dummy.height()/2); } dummy.show(); - qApp->enter_loop(); + tqApp->enter_loop(); dummy.hide(); } @@ -2053,7 +2053,7 @@ void kdesvnfilelist::dispDummy() */ void kdesvnfilelist::slotLock() { - QPtrList*lst = allSelected(); + TQPtrList*lst = allSelected(); FileListViewItemListIterator liter(*lst); FileListViewItem*cur; if (lst->count()==0) { @@ -2062,27 +2062,27 @@ void kdesvnfilelist::slotLock() } KDialogBase*dlg; Logmsg_impl*ptr; - dlg = createDialog(&ptr,QString(i18n("Lock message")),true,"locking_log_msg"); + dlg = createDialog(&ptr,TQString(i18n("Lock message")),true,"locking_log_msg"); if (!dlg) return; ptr->initHistory(); ptr->hideDepth(true); - QCheckBox*_stealLock = new QCheckBox("",ptr,"create_dir_checkbox"); + TQCheckBox*_stealLock = new TQCheckBox("",ptr,"create_dir_checkbox"); _stealLock->setText(i18n("Steal lock?")); ptr->addItemWidget(_stealLock); ptr->m_keepLocksButton->hide(); - if (dlg->exec()!=QDialog::Accepted) { + if (dlg->exec()!=TQDialog::Accepted) { ptr->saveHistory(true); delete dlg; return; } dlg->saveDialogSize(*(Kdesvnsettings::self()->config()),"locking_log_msg",false); - QString logMessage = ptr->getMessage(); + TQString logMessage = ptr->getMessage(); bool steal = _stealLock->isChecked(); ptr->saveHistory(false); - QStringList displist; + TQStringList displist; while ((cur=liter.current())!=0){ ++liter; displist.append(cur->fullName()); @@ -2097,7 +2097,7 @@ void kdesvnfilelist::slotLock() */ void kdesvnfilelist::slotUnlock() { - QPtrList*lst = allSelected(); + TQPtrList*lst = allSelected(); FileListViewItemListIterator liter(*lst); FileListViewItem*cur; if (lst->count()==0) { @@ -2110,7 +2110,7 @@ void kdesvnfilelist::slotUnlock() } bool breakit = res==KMessageBox::Yes; - QStringList displist; + TQStringList displist; while ((cur=liter.current())!=0){ ++liter; displist.append(cur->fullName()); @@ -2154,11 +2154,11 @@ void kdesvnfilelist::slotRangeBlame() SvnItem*k = singleSelected(); if (!k) return; Rangeinput_impl*rdlg; - KDialogBase*dlg = createDialog(&rdlg,QString(i18n("Revisions")),true,"revisions_dlg"); + KDialogBase*dlg = createDialog(&rdlg,TQString(i18n("Revisions")),true,"revisions_dlg"); if (!dlg) { return; } - if (dlg->exec()==QDialog::Accepted) { + if (dlg->exec()==TQDialog::Accepted) { Rangeinput_impl::revision_range r = rdlg->getRange(); m_SvnWrapper->makeBlame(r.first,r.second,k); } @@ -2175,7 +2175,7 @@ void kdesvnfilelist::slotSimpleBaseDiff() chdir(baseUri().local8Bit()); } - QString what; + TQString what; if (!kitem) { what=="."; } else { @@ -2188,7 +2188,7 @@ void kdesvnfilelist::slotSimpleBaseDiff() void kdesvnfilelist::slotSimpleHeadDiff() { FileListViewItem*kitem = singleSelected(); - QString what; + TQString what; if (isWorkingCopy()) { chdir(baseUri().local8Bit()); @@ -2206,7 +2206,7 @@ void kdesvnfilelist::slotSimpleHeadDiff() void kdesvnfilelist::slotDisplayLastDiff() { FileListViewItem*kitem = singleSelected(); - QString what; + TQString what; if (isWorkingCopy()) { chdir(baseUri().local8Bit()); @@ -2214,7 +2214,7 @@ void kdesvnfilelist::slotDisplayLastDiff() svn::Revision end = svn::Revision::PREV; if (!kitem) { if (isWorkingCopy()) { - QListViewItem*fi = firstChild(); + TQListViewItem*fi = firstChild(); kitem = static_cast(fi); if (!kitem) { return; @@ -2248,7 +2248,7 @@ void kdesvnfilelist::slotDisplayLastDiff() void kdesvnfilelist::slotDiffPathes() { - QPtrList*lst = allSelected(); + TQPtrList*lst = allSelected(); if (lst->count()!=2 || !uniqueTypeSelected()) { return; @@ -2258,7 +2258,7 @@ void kdesvnfilelist::slotDiffPathes() FileListViewItem*k1,*k2; k1 = lst->at(0); k2 = lst->at(1); - QString w1,w2; + TQString w1,w2; svn::Revision r1; if (isWorkingCopy()) { @@ -2280,17 +2280,17 @@ void kdesvnfilelist::slotDiffPathes() void kdesvnfilelist::slotMkdir() { SvnItem*k = singleSelected(); - QString parentDir; + TQString tqparentDir; if (k) { if (!k->isDir()) { KMessageBox::sorry(0,i18n("May not make subdirs of a file")); return; } - parentDir=k->fullName(); + tqparentDir=k->fullName(); } else { - parentDir=baseUri(); + tqparentDir=baseUri(); } - QString ex = m_SvnWrapper->makeMkdir(parentDir); + TQString ex = m_SvnWrapper->makeMkdir(tqparentDir); if (!ex.isEmpty()) { slotDirAdded(ex,static_cast(k)); } @@ -2302,12 +2302,12 @@ void kdesvnfilelist::slotMkBaseDirs() if (!isopen) { return; } - QString parentDir=baseUri(); - QStringList targets; - targets.append(parentDir+"/trunk"); - targets.append(parentDir+"/branches"); - targets.append(parentDir+"/tags"); - QString msg = i18n("Automatic generated base layout by kdesvn"); + TQString tqparentDir=baseUri(); + TQStringList targets; + targets.append(tqparentDir+"/trunk"); + targets.append(tqparentDir+"/branches"); + targets.append(tqparentDir+"/tags"); + TQString msg = i18n("Automatic generated base tqlayout by kdesvn"); isopen = m_SvnWrapper->makeMkdir(targets,msg); if (isopen) { slotDirAdded(targets[0],0); @@ -2322,7 +2322,7 @@ void kdesvnfilelist::slotMkBaseDirs() void kdesvnfilelist::slotDiffRevisions() { SvnItem*k = singleSelected(); - QString what; + TQString what; if (isWorkingCopy()) { chdir(baseUri().local8Bit()); @@ -2334,11 +2334,11 @@ void kdesvnfilelist::slotDiffRevisions() what = relativePath(k); } Rangeinput_impl*rdlg; - KDialogBase*dlg = createDialog(&rdlg,QString(i18n("Revisions")),true,"revisions_dlg"); + KDialogBase*dlg = createDialog(&rdlg,TQString(i18n("Revisions")),true,"revisions_dlg"); if (!dlg) { return; } - if (dlg->exec()==QDialog::Accepted) { + if (dlg->exec()==TQDialog::Accepted) { Rangeinput_impl::revision_range r = rdlg->getRange(); svn::Revision _peg=(isWorkingCopy()?svn::Revision::WORKING:remoteRevision()); m_SvnWrapper->makeDiff(what,r.first,r.second,_peg,k?k->isDir():true); @@ -2352,12 +2352,12 @@ void kdesvnfilelist::slotSelectBrowsingRevision() { if (isWorkingCopy()) return; Rangeinput_impl*rdlg; - KDialogBase*dlg = createDialog(&rdlg,QString(i18n("Revisions")),true,"revisions_dlg"); + KDialogBase*dlg = createDialog(&rdlg,TQString(i18n("Revisions")),true,"revisions_dlg"); if (!dlg) { return; } rdlg->setStartOnly(true); - if (dlg->exec()==QDialog::Accepted) { + if (dlg->exec()==TQDialog::Accepted) { Rangeinput_impl::revision_range r = rdlg->getRange(); m_pList->m_remoteRevision= r.first; if (childCount()==0) { @@ -2378,12 +2378,12 @@ void kdesvnfilelist::slotRevisionCat() SvnItem*k = singleSelected(); if (!k) return; Rangeinput_impl*rdlg; - KDialogBase*dlg = createDialog(&rdlg,QString(i18n("Revisions")),true,"revisions_dlg"); + KDialogBase*dlg = createDialog(&rdlg,TQString(i18n("Revisions")),true,"revisions_dlg"); if (!dlg) { return; } rdlg->setStartOnly(true); - if (dlg->exec()==QDialog::Accepted) { + if (dlg->exec()==TQDialog::Accepted) { Rangeinput_impl::revision_range r = rdlg->getRange(); m_SvnWrapper->slotMakeCat(r.first, k->fullName(),k->shortName(),r.first,0); } @@ -2401,9 +2401,9 @@ bool kdesvnfilelist::refreshItem(FileListViewItem*item) return false; } try { - item->setStat(svnclient()->singleStatus(item->fullName(),false,m_pList->m_remoteRevision)); + item->setStat(svnclient()->singletqStatus(item->fullName(),false,m_pList->m_remoteRevision)); } catch (const svn::ClientException&e) { - item->setStat(new svn::Status()); + item->setStat(new svn::tqStatus()); return false; } return true; @@ -2453,7 +2453,7 @@ void kdesvnfilelist::reinitItems(FileListViewItem*_item) */ void kdesvnfilelist::slotInfo() { - QPtrList lst; + TQPtrList lst; SelectionList(&lst); svn::Revision rev(isWorkingCopy()?svn::Revision::UNDEFINED:m_pList->m_remoteRevision); if (!isWorkingCopy()) { @@ -2473,9 +2473,9 @@ void kdesvnfilelist::slotInfo() /*! - \fn kdesvnfilelist::slotDirItemCreated(const QString&) + \fn kdesvnfilelist::slotDirItemCreated(const TQString&) */ -void kdesvnfilelist::slotDirItemCreated(const QString&what) +void kdesvnfilelist::slotDirItemCreated(const TQString&what) { m_pList->stopDirTimer(); m_pList->dirItems[what]='C'; @@ -2486,16 +2486,16 @@ void kdesvnfilelist::slotDirItemCreated(const QString&what) void kdesvnfilelist::updateParents(FileListViewItem*item) { - if (!item || !item->parent()) return; - FileListViewItem*it = static_cast(item->parent()); + if (!item || !item->tqparent()) return; + FileListViewItem*it = static_cast(item->tqparent()); it->update(); updateParents(it); } /*! - \fn kdesvnfilelist::slotDirItemDirty(const QString&) + \fn kdesvnfilelist::slotDirItemDirty(const TQString&) */ -void kdesvnfilelist::slotDirItemDirty(const QString&what) +void kdesvnfilelist::slotDirItemDirty(const TQString&what) { m_pList->stopDirTimer(); m_pList->dirItems[what]='M'; @@ -2514,12 +2514,12 @@ void kdesvnfilelist::slotDisplayProperties() void kdesvnfilelist::dispProperties(bool force) { - CursorStack a(Qt::BusyCursor); + CursorStack a(TQt::BusyCursor); bool cache_Only = (!force && isNetworked() && !Kdesvnsettings::properties_on_remote_items()); svn::PathPropertiesMapListPtr pm; SvnItem*k = singleSelected(); if (!k || !k->isRealVersioned()) { - emit sigProplist(svn::PathPropertiesMapListPtr(),false,QString("")); + emit sigProplist(svn::PathPropertiesMapListPtr(),false,TQString("")); return; } kdDebug()<<"Cacheonly: "<::Iterator it; + TQMap::Iterator it; m_pList->m_fileTip->setItem(0); viewport()->setUpdatesEnabled(false); - bool repaintit=false; + bool tqrepaintit=false; for (it=m_pList->dirItems.begin();it!=m_pList->dirItems.end();++it) { - QString what = it.key(); - QChar c = it.data(); + TQString what = it.key(); + TQChar c = it.data(); FileListViewItem*item = findEntryItem(what); if (!item) { m_pList->m_DirWatch->removeDir(what); @@ -2554,9 +2554,9 @@ void kdesvnfilelist::_dirwatchTimeout() } if (item->isDir()) { if (item->isRealVersioned()) { - repaintit = refreshRecursive(item,false); + tqrepaintit = refreshRecursive(item,false); } else { - QListViewItem *_s; + TQListViewItem *_s; while ( (_s=item->firstChild())) { delete _s; @@ -2564,7 +2564,7 @@ void kdesvnfilelist::_dirwatchTimeout() checkUnversionedDirs(item); } } - updateParents(static_cast(item->parent())); + updateParents(static_cast(item->tqparent())); } else if (c=='D') { if (item->isDir()) { m_pList->m_DirWatch->removeDir(what); @@ -2574,11 +2574,11 @@ void kdesvnfilelist::_dirwatchTimeout() if (item->isDeleted()) { m_SvnWrapper->addModifiedCache(item->stat()); } else if (!item->isMissing()) { - QFileInfo fi(what); + TQFileInfo fi(what); if (!fi.exists()) { - FileListViewItem*p = static_cast(item->parent()); + FileListViewItem*p = static_cast(item->tqparent()); delete item; - repaintit=true; + tqrepaintit=true; item = 0; if (p && p->isVersioned()) { p->update(); @@ -2599,19 +2599,19 @@ void kdesvnfilelist::_dirwatchTimeout() } m_pList->dirItems.clear(); viewport()->setUpdatesEnabled(true); - if (repaintit) { -// viewport()->repaint(); + if (tqrepaintit) { +// viewport()->tqrepaint(); } } /*! - \fn kdesvnfilelist::slotDirItemDeleted(const QString&) + \fn kdesvnfilelist::slotDirItemDeleted(const TQString&) */ -void kdesvnfilelist::slotDirItemDeleted(const QString&what) +void kdesvnfilelist::slotDirItemDeleted(const TQString&what) { m_pList->stopDirTimer(); m_pList->m_fileTip->setItem(0); - QMap::Iterator it = m_pList->dirItems.find(what); + TQMap::Iterator it = m_pList->dirItems.tqfind(what); if (it!=m_pList->dirItems.end() && m_pList->dirItems[what]=='A') { m_pList->dirItems.erase(it); } else { @@ -2621,7 +2621,7 @@ void kdesvnfilelist::slotDirItemDeleted(const QString&what) } -void kdesvnfilelist::gotPreview( const KFileItem*, const QPixmap&) +void kdesvnfilelist::gotPreview( const KFileItem*, const TQPixmap&) { #if 0 FileListViewItem*which = findEntryItem(item->localPath()); @@ -2640,10 +2640,10 @@ void kdesvnfilelist::gotPreviewResult() // m_previewJob = 0; } -FileListViewItem* kdesvnfilelist::findEntryItem(const QString&what,FileListViewItem*startAt) +FileListViewItem* kdesvnfilelist::findEntryItem(const TQString&what,FileListViewItem*startAt) { if (!startAt && !what.startsWith(baseUri())) return 0; - QString _what = what; + TQString _what = what; FileListViewItem*_s,*_temp; if (!startAt) { while (_what.endsWith("/")) { @@ -2671,20 +2671,20 @@ FileListViewItem* kdesvnfilelist::findEntryItem(const QString&what,FileListViewI /*! - \fn kdesvnfilelist::contentsMouseMoveEvent( QMouseEvent *e ) + \fn kdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e ) */ -void kdesvnfilelist::contentsMouseMoveEvent( QMouseEvent *e ) +void kdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e ) { if (!m_pList->mousePressed) { if (Kdesvnsettings::display_file_tips()) { - QPoint vp = contentsToViewport( e->pos() ); + TQPoint vp = contentsToViewport( e->pos() ); FileListViewItem*item = isExecuteArea( vp ) ? static_cast(itemAt( vp )) : 0L; if (item) { - vp.setY( itemRect( item ).y() ); - QRect rect( viewportToContents( vp ), QSize(20, item->height()) ); + vp.setY( tqitemRect( item ).y() ); + TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) ); m_pList->m_fileTip->setItem( static_cast(item), rect, item->pixmap(0)); m_pList->m_fileTip->setPreview(KGlobalSettings::showFilePreview(item->fullName())/*&&isWorkingCopy()*/ &&Kdesvnsettings::display_previews_in_file_tips()); @@ -2700,7 +2700,7 @@ void kdesvnfilelist::contentsMouseMoveEvent( QMouseEvent *e ) } else { - if (( m_pList->presspos - e->pos() ).manhattanLength() > QApplication::startDragDistance()) + if (( m_pList->presspos - e->pos() ).manhattanLength() > TQApplication::startDragDistance()) { m_pList->m_fileTip->setItem(0); m_pList->mousePressed=false; @@ -2710,12 +2710,12 @@ void kdesvnfilelist::contentsMouseMoveEvent( QMouseEvent *e ) KListView::contentsMouseMoveEvent( e ); } -void kdesvnfilelist::contentsMousePressEvent(QMouseEvent*e) +void kdesvnfilelist::contentsMousePressEvent(TQMouseEvent*e) { KListView::contentsMousePressEvent(e); m_pList->m_fileTip->setItem(0); - QPoint p(contentsToViewport( e->pos())); - QListViewItem *i = itemAt( p ); + TQPoint p(contentsToViewport( e->pos())); + TQListViewItem *i = itemAt( p ); // this is from qt the example - hopefully I got my problems with drag&drop fixed. if ( i ) { // if the user clicked into the root decoration of the item, don't try to start a drag! @@ -2729,23 +2729,23 @@ void kdesvnfilelist::contentsMousePressEvent(QMouseEvent*e) } } -void kdesvnfilelist::contentsMouseReleaseEvent(QMouseEvent*e) +void kdesvnfilelist::contentsMouseReleaseEvent(TQMouseEvent*e) { KListView::contentsMouseReleaseEvent(e); m_pList->mousePressed = false; } /*! - \fn kdesvnfilelist::contentsWheelEvent( QWheelEvent * e ) + \fn kdesvnfilelist::contentsWheelEvent( TQWheelEvent * e ) */ -void kdesvnfilelist::contentsWheelEvent( QWheelEvent * e ) +void kdesvnfilelist::contentsWheelEvent( TQWheelEvent * e ) { // when scrolling with mousewheel, stop possible pending filetip m_pList->m_fileTip->setItem(0); KListView::contentsWheelEvent( e ); } -void kdesvnfilelist::leaveEvent(QEvent*e) +void kdesvnfilelist::leaveEvent(TQEvent*e) { m_pList->m_fileTip->setItem( 0 ); KListView::leaveEvent( e ); @@ -2754,11 +2754,11 @@ void kdesvnfilelist::leaveEvent(QEvent*e) void kdesvnfilelist::slotSettingsChanged() { m_pList->m_fileTip->setOptions(!isNetworked()&&Kdesvnsettings::display_file_tips()&& - QToolTip::isGloballyEnabled(),true,6); + TQToolTip::isGloballyEnabled(),true,6); if (m_pList->reReadSettings()) { refreshCurrentTree(); } else { - viewport()->repaint(); + viewport()->tqrepaint(); } enableActions(); sort(); @@ -2779,11 +2779,11 @@ void kdesvnfilelist::slotRelocate() KMessageBox::error(0,i18n("Error getting entry to relocate")); return; } - QString path,fromUrl; + TQString path,fromUrl; path = k->fullName(); fromUrl = k->Url(); CheckoutInfo_impl*ptr; - KDialogBase * dlg = createDialog(&ptr,i18n("Relocate path %1").arg(path),true,"relocate_dlg"); + KDialogBase * dlg = createDialog(&ptr,i18n("Relocate path %1").tqarg(path),true,"relocate_dlg"); if (dlg) { ptr->setStartUrl(fromUrl); ptr->disableAppend(true); @@ -2794,7 +2794,7 @@ void kdesvnfilelist::slotRelocate() ptr->hideDepth(true,true); bool done = false; dlg->resize(dlg->configDialogSize(*(Kdesvnsettings::self()->config()),"relocate_dlg")); - if (dlg->exec()==QDialog::Accepted) { + if (dlg->exec()==TQDialog::Accepted) { done = m_SvnWrapper->makeRelocate(fromUrl,ptr->reposURL(),path,ptr->overwrite()); } dlg->saveDialogSize(*(Kdesvnsettings::self()->config()),"relocate_dlg",false); @@ -2804,22 +2804,22 @@ void kdesvnfilelist::slotRelocate() refreshItem(k->fItem()); } -void kdesvnfilelist::checkUnversionedDirs( FileListViewItem * _parent ) +void kdesvnfilelist::checkUnversionedDirs( FileListViewItem * _tqparent ) { - QDir d; - if (_parent) - d.setPath(_parent->fullName()); //FIXME: this one is not reliable, what if _parent == 0?? + TQDir d; + if (_tqparent) + d.setPath(_tqparent->fullName()); //FIXME: this one is not reliable, what if _tqparent == 0?? // else // d.setPath(this->firstChild()->fullName()); - d.setFilter( QDir::Files | QDir::Dirs ); + d.setFilter( TQDir::Files | TQDir::Dirs ); - const QFileInfoList *list = d.entryInfoList(); + const TQFileInfoList *list = d.entryInfoList(); if (!list) { return; } - QFileInfoListIterator nonversioned_it( *list ); - QFileInfo *fi; + TQFileInfoListIterator nonversioned_it( *list ); + TQFileInfo *fi; svn::StatusEntries nonversioned_list; @@ -2839,18 +2839,18 @@ void kdesvnfilelist::checkUnversionedDirs( FileListViewItem * _parent ) // else // entry.kind = svn_node_file; // -// svn::Status stat(fi->fileName(), &wc_stat); +// svn::tqStatus stat(fi->fileName(), &wc_stat); - svn::StatusPtr stat(new svn::Status(fi->absFilePath())); + svn::StatusPtr stat(new svn::tqStatus(fi->absFilePath())); // start copying insertDirs FileListViewItem * item; - if (!_parent) { + if (!_tqparent) { item = new FileListViewItem(this, stat); kdDebug()<< "creating new FileListViewitem " + item->fullName() << endl; } else { - item = new FileListViewItem(this,_parent, stat); - kdDebug()<< "creating new FileListViewitem (with parent) " + item->fullName() << endl; + item = new FileListViewItem(this,_tqparent, stat); + kdDebug()<< "creating new FileListViewitem (with tqparent) " + item->fullName() << endl; } if (fi->isDir()) { m_Dirsread[item->fullName()]=false; @@ -2866,13 +2866,13 @@ void kdesvnfilelist::checkUnversionedDirs( FileListViewItem * _parent ) // end of copying insertDirs nonversioned_list.append(stat); - kdDebug() << "creating new FileListViewItem from QDir entry: " << fi->fileName() << endl; + kdDebug() << "creating new FileListViewItem from TQDir entry: " << fi->fileName() << endl; } ++nonversioned_it; } // uncomment this if you've ben able to set svn_node_kind (see above) - //this->insertDirs(_parent, nonversioned_list); + //this->insertDirs(_tqparent, nonversioned_list); } void kdesvnfilelist::rescanIconsRec(FileListViewItem*startAt,bool checkNewer,bool no_update) @@ -2886,13 +2886,13 @@ void kdesvnfilelist::rescanIconsRec(FileListViewItem*startAt,bool checkNewer,boo if (!_s) { return; } - svn::SharedPointer d; + svn::SharedPointer d; while (_s) { //_s->makePixmap(); if (!no_update) { if (m_SvnWrapper->getUpdated(_s->stat()->path(),d) && d) { - _s->updateStatus(d); + _s->updatetqStatus(d); } else { _s->update(); } @@ -2939,7 +2939,7 @@ void kdesvnfilelist::slotCheckNewItems() */ void kdesvnfilelist::slotMakeRangeLog() { - QString what; + TQString what; SvnItem*k = SelectedOrMain(); if (k) { what = k->fullName(); @@ -2949,13 +2949,13 @@ void kdesvnfilelist::slotMakeRangeLog() return; } Rangeinput_impl*rdlg; - KDialogBase*dlg = createDialog(&rdlg,QString(i18n("Revisions")),true,"revisions_dlg"); + KDialogBase*dlg = createDialog(&rdlg,TQString(i18n("Revisions")),true,"revisions_dlg"); if (!dlg) { return; } bool list = Kdesvnsettings::self()->log_always_list_changed_files(); int i = dlg->exec(); - if (i==QDialog::Accepted) { + if (i==TQDialog::Accepted) { Rangeinput_impl::revision_range r = rdlg->getRange(); m_SvnWrapper->makeLog(r.first,r.second,(isWorkingCopy()?svn::Revision::UNDEFINED:m_pList->m_remoteRevision), what,list,0); } @@ -2965,7 +2965,7 @@ void kdesvnfilelist::slotMakeRangeLog() void kdesvnfilelist::slotMakeTree() { - QString what; + TQString what; SvnItem*k = SelectedOrMain(); if (k) { what = k->fullName(); @@ -2981,7 +2981,7 @@ void kdesvnfilelist::slotMakeTree() void kdesvnfilelist::slotMakePartTree() { - QString what; + TQString what; SvnItem*k = SelectedOrMain(); if (k) { what = k->fullName(); @@ -2991,18 +2991,18 @@ void kdesvnfilelist::slotMakePartTree() return; } Rangeinput_impl*rdlg; - KDialogBase*dlg = createDialog(&rdlg,QString(i18n("Revisions")),true,"revisions_dlg"); + KDialogBase*dlg = createDialog(&rdlg,TQString(i18n("Revisions")),true,"revisions_dlg"); if (!dlg) { return; } int i = dlg->exec(); Rangeinput_impl::revision_range r; - if (i==QDialog::Accepted) { + if (i==TQDialog::Accepted) { r = rdlg->getRange(); } dlg->saveDialogSize(*(Kdesvnsettings::self()->config()),"revisions_dlg",false); - if (i==QDialog::Accepted) { + if (i==TQDialog::Accepted) { svn::Revision rev(isWorkingCopy()?svn::Revision::UNDEFINED:m_pList->m_remoteRevision); m_SvnWrapper->makeTree(what,rev,r.first,r.second); } @@ -3013,7 +3013,7 @@ void kdesvnfilelist::slotMakePartTree() */ void kdesvnfilelist::slotMakeLog() { - QString what; + TQString what; SvnItem*k = SelectedOrMain(); if (k) { what = k->fullName(); @@ -3059,16 +3059,16 @@ void kdesvnfilelist::slotUnfoldTree() { StopSimpleDlg sdlg(0,0,i18n("Unfold tree"),i18n("Unfold all folder")); - connect(this,SIGNAL(sigListError()), - &sdlg,SLOT(makeCancel())); + connect(this,TQT_SIGNAL(sigListError()), + &sdlg,TQT_SLOT(makeCancel())); - QListViewItemIterator it(this); - QTime t;t.start(); + TQListViewItemIterator it(this); + TQTime t;t.start(); setUpdatesEnabled(false); { WidgetBlockStack a(this); - while (QListViewItem* item = it.current()) + while (TQListViewItem* item = it.current()) { if (item->isExpandable()) { if (sdlg.isCanceld()) { @@ -3077,7 +3077,7 @@ void kdesvnfilelist::slotUnfoldTree() } if (t.elapsed()>=200) { sdlg.slotTick(); - kapp->processEvents(20); + kapp->tqprocessEvents(20); t.restart(); } ((FileListViewItem*)item)->setOpenNoBlock(true); @@ -3087,18 +3087,18 @@ void kdesvnfilelist::slotUnfoldTree() } setFocus(); setUpdatesEnabled(true); - viewport()->repaint(); - repaint(); + viewport()->tqrepaint(); + tqrepaint(); m_SvnWrapper->slotCancel(false); } void kdesvnfilelist::slotFoldTree() { - QListViewItemIterator it(this); - while (QListViewItem* item = it.current()) + TQListViewItemIterator it(this); + while (TQListViewItem* item = it.current()) { // don't close the top level directory - if (item->isExpandable() && item->parent()) + if (item->isExpandable() && item->tqparent()) item->setOpen(false); ++it; @@ -3126,13 +3126,13 @@ bool kdesvnfilelist::uniqueTypeSelected() return true; } -void kdesvnfilelist::slotChangeProperties(const svn::PropertiesMap&pm,const QValueList&dellist,const QString&path) +void kdesvnfilelist::slotChangeProperties(const svn::PropertiesMap&pm,const TQValueList&dellist,const TQString&path) { m_SvnWrapper->changeProperties(pm,dellist,path); FileListViewItem* which = singleSelected(); kdDebug()<<(which?which->fullName():"nix") << " -> " << path<fullName()==path) { - which->refreshStatus(); + which->refreshtqStatus(); refreshCurrent(which); _propListTimeout(); } diff --git a/src/svnfrontend/kdesvnfilelist.h b/src/svnfrontend/kdesvnfilelist.h index 55ac7d3..0056cd7 100644 --- a/src/svnfrontend/kdesvnfilelist.h +++ b/src/svnfrontend/kdesvnfilelist.h @@ -28,9 +28,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include class KAction; class KActionMenu; @@ -53,9 +53,10 @@ namespace svn { class kdesvnfilelist : public KListView,public ItemDisplay { Q_OBJECT + TQ_OBJECT friend class FileListViewItem; public: - kdesvnfilelist(KActionCollection*,QWidget *parent = 0, const char *name = 0); + kdesvnfilelist(KActionCollection*,TQWidget *tqparent = 0, const char *name = 0); virtual ~kdesvnfilelist(); virtual bool openURL( const KURL &url,bool noReinit=false ); @@ -63,7 +64,7 @@ public: virtual SvnItem*Selected(); virtual void SelectionList(SvnItemList*target); - virtual QWidget*realWidget(); + virtual TQWidget*realWidget(); KActionCollection*filesActions(); bool refreshItem(FileListViewItem*); @@ -71,7 +72,7 @@ public: protected: const svn::Revision& remoteRevision()const; bool m_deletePerfect; - QMap m_Dirsread; + TQMap m_Dirsread; KActionCollection* m_filesAction; KAction*m_BlameAction,*m_BlameRangeAction,*m_CatAction,*m_MkdirAction; @@ -84,9 +85,9 @@ protected: SvnActions*m_SvnWrapper; - /* the parent entry must removed from list before */ - void insertDirs(FileListViewItem * _parent,svn::StatusEntries&); - bool checkDirs(const QString&,FileListViewItem * _parent); + /* the tqparent entry must removed from list before */ + void insertDirs(FileListViewItem * _tqparent,svn::StatusEntries&); + bool checkDirs(const TQString&,FileListViewItem * _tqparent); void setupActions(); svn::Client*svnclient(); @@ -95,62 +96,62 @@ protected: FileListViewItemList* allSelected(); template KDialogBase* createDialog(T**ptr, - const QString&_head, + const TQString&_head, bool OkCancel=false, const char*name="dialog", bool showHelp=false ); FileListViewItemList* m_SelectedItems; - FileListViewItem* findEntryItem(const QString&,FileListViewItem*startAt=0); + FileListViewItem* findEntryItem(const TQString&,FileListViewItem*startAt=0); virtual bool refreshRecursive(FileListViewItem*,bool down=true); virtual void updateParents(FileListViewItem*); - virtual void checkUnversionedDirs( FileListViewItem * _parent ); + virtual void checkUnversionedDirs( FileListViewItem * _tqparent ); /** - * Overridden virtuals for Qt drag 'n drop (XDND) + * Overridden virtuals for TQt drag 'n drop (XDND) */ - virtual void contentsDragEnterEvent( QDragEnterEvent* ); - virtual void contentsDragLeaveEvent( QDragLeaveEvent* ); - virtual void contentsDragMoveEvent( QDragMoveEvent* ); - virtual void contentsDropEvent( QDropEvent* ); - virtual bool acceptDrag(QDropEvent *event)const; + virtual void contentsDragEnterEvent( TQDragEnterEvent* ); + virtual void contentsDragLeaveEvent( TQDragLeaveEvent* ); + virtual void contentsDragMoveEvent( TQDragMoveEvent* ); + virtual void contentsDropEvent( TQDropEvent* ); + virtual bool acceptDrag(TQDropEvent *event)const; //virtual void startDrag(); - virtual QDragObject* dragObject(); + virtual TQDragObject* dragObject(); void dispDummy(); void reinitItems(FileListViewItem*_item = 0); KURL::List selectedUrls(); - virtual void contentsMouseMoveEvent( QMouseEvent *e ); - virtual void contentsMousePressEvent(QMouseEvent*e); - virtual void contentsMouseReleaseEvent(QMouseEvent*e); - virtual void contentsWheelEvent( QWheelEvent * e ); - virtual void leaveEvent(QEvent*e); - virtual void rescanIconsRec(FileListViewItem*_parent=0,bool checkNewer=false,bool no_update=false); + virtual void contentsMouseMoveEvent( TQMouseEvent *e ); + virtual void contentsMousePressEvent(TQMouseEvent*e); + virtual void contentsMouseReleaseEvent(TQMouseEvent*e); + virtual void contentsWheelEvent( TQWheelEvent * e ); + virtual void leaveEvent(TQEvent*e); + virtual void rescanIconsRec(FileListViewItem*_tqparent=0,bool checkNewer=false,bool no_update=false); KTrader::OfferList offersList(SvnItem*item,bool execOnly=false); private: KdesvnFileListPrivate*m_pList; void cleanHighLighter(); - bool validDropEvent(QDropEvent*event,QListViewItem*&item); + bool validDropEvent(TQDropEvent*event,TQListViewItem*&item); void copy_move(bool move); protected slots: virtual void slotSelectBrowsingRevision(); - virtual void slotItemRead(QListViewItem*); - virtual void slotContextMenuRequested(QListViewItem *, const QPoint &, int); + virtual void slotItemRead(TQListViewItem*); + virtual void slotContextMenuRequested(TQListViewItem *, const TQPoint &, int); virtual void slotSelectionChanged(); - virtual void slotClientException(const QString&); - virtual void slotNotifyMessage(const QString&); - virtual void slotDirAdded(const QString&,FileListViewItem*); + virtual void slotClientException(const TQString&); + virtual void slotNotifyMessage(const TQString&); + virtual void slotDirAdded(const TQString&,FileListViewItem*); virtual void slotReinitItem(SvnItem*); - virtual void slotItemDoubleClicked(QListViewItem*); + virtual void slotItemDoubleClicked(TQListViewItem*); virtual void slotImportIntoCurrent(bool); virtual void slotImportDirsIntoCurrent(); - virtual void slotImportIntoDir(const KURL&,const QString&,bool); + virtual void slotImportIntoDir(const KURL&,const TQString&,bool); /* subversion slots */ virtual void slotChangeToRepository(); @@ -159,8 +160,8 @@ protected slots: virtual void slotTryResolve(); virtual void slotMergeRevisions(); virtual void slotMerge(); - virtual void slotDropped(QDropEvent *,QListViewItem*); - virtual void viewportPaintEvent(QPaintEvent *); + virtual void slotDropped(TQDropEvent *,TQListViewItem*); + virtual void viewportPaintEvent(TQPaintEvent *); virtual void slotRename(); virtual void slotCopy(); virtual void slotCat(); @@ -170,7 +171,7 @@ protected slots: /* callback slots */ virtual void slotCopyFinished( KIO::Job *); virtual void slotDeleteFinished(KIO::Job*); - virtual void _openURL(const QString&); + virtual void _openURL(const TQString&); virtual void _dirwatchTimeout(); virtual void _propListTimeout(); @@ -181,15 +182,15 @@ protected slots: virtual void enableActions(); signals: - void sigLogMessage(const QString&); - void changeCaption(const QString&); - void sigShowPopup(const QString&,QWidget**); + void sigLogMessage(const TQString&); + void changeCaption(const TQString&); + void sigShowPopup(const TQString&,TQWidget**); void sigUrlOpend(bool); void sigSwitchUrl(const KURL&); - void sigUrlChanged(const QString&); - void sigProplist(const svn::PathPropertiesMapListPtr&,bool,const QString&); + void sigUrlChanged(const TQString&); + void sigProplist(const svn::PathPropertiesMapListPtr&,bool,const TQString&); void sigListError(); - void sigCacheStatus(Q_LONG,Q_LONG); + void sigCachetqStatus(TQ_LONG,TQ_LONG); public slots: virtual void refreshCurrentTree(); @@ -198,7 +199,7 @@ public slots: virtual void slotMkdir(); virtual void slotMkBaseDirs(); virtual void slotSettingsChanged(); - virtual void slotChangeProperties(const svn::PropertiesMap&,const QValueList&,const QString&); + virtual void slotChangeProperties(const svn::PropertiesMap&,const TQValueList&,const TQString&); protected slots: @@ -215,9 +216,9 @@ protected slots: virtual void slotRevisionCat(); virtual void slotCheckUpdates(); virtual void slotInfo(); - virtual void slotDirItemCreated(const QString&); - virtual void slotDirItemDirty(const QString&); - virtual void slotDirItemDeleted(const QString&); + virtual void slotDirItemCreated(const TQString&); + virtual void slotDirItemDirty(const TQString&); + virtual void slotDirItemDeleted(const TQString&); virtual void slotRelocate(); virtual void slotRescanIcons(bool); virtual void slotCheckNewItems(); @@ -233,7 +234,7 @@ protected slots: virtual void slotFoldTree(); private slots: - void gotPreview( const KFileItem*, const QPixmap& ); + void gotPreview( const KFileItem*, const TQPixmap& ); void gotPreviewResult(); protected: virtual bool uniqueTypeSelected(); diff --git a/src/svnfrontend/keystatus.cpp b/src/svnfrontend/keystatus.cpp index 5e6a324..d3a3c54 100644 --- a/src/svnfrontend/keystatus.cpp +++ b/src/svnfrontend/keystatus.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "keystatus.h" -#include +#include #include void KeyState::keystate(int*root_x,int*root_y,int*win_x,int*win_y,unsigned int*keybstate) @@ -31,9 +31,9 @@ void KeyState::keystate(int*root_x,int*root_y,int*win_x,int*win_y,unsigned int*k root_x, root_y, win_x, win_y, &kstate); *keybstate=0; if (kstate&ControlMask) { - *keybstate|=Qt::ControlButton; + *keybstate|=TQt::ControlButton; } if (kstate&ShiftMask) { - *keybstate|=Qt::ShiftButton; + *keybstate|=TQt::ShiftButton; } } diff --git a/src/svnfrontend/keystatus.h b/src/svnfrontend/keystatus.h index 75fd3a9..eec7505 100644 --- a/src/svnfrontend/keystatus.h +++ b/src/svnfrontend/keystatus.h @@ -25,7 +25,7 @@ class KeyState public: KeyState(){} ~KeyState(){} - static void keystate(int*,int*,int*,int*,unsigned int*mask); + static void keystate(int*,int*,int*,int*,unsigned int*tqmask); }; diff --git a/src/svnfrontend/loaddmpdlg.ui b/src/svnfrontend/loaddmpdlg.ui index 5c22cee..1f1f845 100644 --- a/src/svnfrontend/loaddmpdlg.ui +++ b/src/svnfrontend/loaddmpdlg.ui @@ -1,10 +1,10 @@ LoadDmpDlg - + LoadDmpDlg - + 0 0 @@ -16,22 +16,22 @@ unnamed - + - layout9 + tqlayout9 unnamed - + textLabel5 Load into folder: - + AlignVCenter|AlignRight @@ -41,14 +41,14 @@ If not empty, load the dump into a specific folder instead into root of repository. This folder must exist before loading the dump. - + textLabel3 Dump file: - + AlignVCenter|AlignRight @@ -57,14 +57,14 @@ m_Dumpfile - + textLabel4 Load into repository: - + AlignVCenter|AlignRight @@ -89,7 +89,7 @@ - + m_UuidGroup @@ -106,7 +106,7 @@ unnamed - + m_UUidDefault @@ -120,7 +120,7 @@ true - + m_UUidIgnore @@ -131,7 +131,7 @@ - + m_UUidForce @@ -144,7 +144,7 @@ - + m_UsePre @@ -155,7 +155,7 @@ - + m_UsePost @@ -170,7 +170,7 @@ - + kurlrequester.h klineedit.h diff --git a/src/svnfrontend/loaddmpdlg_impl.cpp b/src/svnfrontend/loaddmpdlg_impl.cpp index 63954a2..48565b4 100644 --- a/src/svnfrontend/loaddmpdlg_impl.cpp +++ b/src/svnfrontend/loaddmpdlg_impl.cpp @@ -19,16 +19,16 @@ ***************************************************************************/ #include "loaddmpdlg_impl.h" -#include -#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include -LoadDmpDlg_impl::LoadDmpDlg_impl(QWidget *parent, const char *name) - :LoadDmpDlg(parent, name) +LoadDmpDlg_impl::LoadDmpDlg_impl(TQWidget *tqparent, const char *name) + :LoadDmpDlg(tqparent, name) { } @@ -66,10 +66,10 @@ int LoadDmpDlg_impl::uuidAction()const /*! \fn LoadDmpDlg_impl::dumpFile()const */ -QString LoadDmpDlg_impl::dumpFile()const +TQString LoadDmpDlg_impl::dumpFile()const { KURL u = m_Dumpfile->url(); - QString res = u.path(); + TQString res = u.path(); while (res.endsWith("/")) { res.truncate(res.length()-1); } @@ -80,10 +80,10 @@ QString LoadDmpDlg_impl::dumpFile()const /*! \fn LoadDmpDlg_impl::repository()const */ -QString LoadDmpDlg_impl::repository()const +TQString LoadDmpDlg_impl::repository()const { KURL u = m_Repository->url(); - QString res = u.path(); + TQString res = u.path(); while (res.endsWith("/")) { res.truncate(res.length()-1); } @@ -92,11 +92,11 @@ QString LoadDmpDlg_impl::repository()const /*! - \fn LoadDmpDlg_impl::parentPath()const + \fn LoadDmpDlg_impl::tqparentPath()const */ -QString LoadDmpDlg_impl::parentPath()const +TQString LoadDmpDlg_impl::tqparentPath()const { - QString res = m_Rootfolder->text(); + TQString res = m_Rootfolder->text(); while (res.endsWith("/")) { res.truncate(res.length()-1); } diff --git a/src/svnfrontend/loaddmpdlg_impl.h b/src/svnfrontend/loaddmpdlg_impl.h index fef0950..2fa61ad 100644 --- a/src/svnfrontend/loaddmpdlg_impl.h +++ b/src/svnfrontend/loaddmpdlg_impl.h @@ -24,15 +24,16 @@ class LoadDmpDlg_impl: public LoadDmpDlg { Q_OBJECT + TQ_OBJECT public: - LoadDmpDlg_impl(QWidget *parent = 0, const char *name = 0); + LoadDmpDlg_impl(TQWidget *tqparent = 0, const char *name = 0); virtual ~LoadDmpDlg_impl(); bool usePost()const; bool usePre()const; int uuidAction()const; - QString dumpFile()const; - QString repository()const; - QString parentPath()const; + TQString dumpFile()const; + TQString repository()const; + TQString tqparentPath()const; public slots: }; diff --git a/src/svnfrontend/merge_dlg.ui b/src/svnfrontend/merge_dlg.ui index f26179a..142342c 100644 --- a/src/svnfrontend/merge_dlg.ui +++ b/src/svnfrontend/merge_dlg.ui @@ -1,10 +1,10 @@ MergeDlg - + MergeDlg - + 0 0 @@ -19,17 +19,17 @@ unnamed - + - layout5 + tqlayout5 unnamed - + - layout6 + tqlayout6 @@ -45,14 +45,14 @@ m_SrcTwoInput - + m_SrcOneLabel Source 1: - + AlignVCenter|AlignRight @@ -61,39 +61,39 @@ m_OutInput - + m_SrcTwoLabel Source 2: - + AlignVCenter|AlignRight - + m_OutLabel Output to: - + AlignVCenter|AlignRight - + - layout4 + tqlayout4 unnamed - + m_ForceCheck @@ -104,7 +104,7 @@ - + m_RelatedCheck @@ -112,7 +112,7 @@ Handle unrelated as related items - + m_DryCheck @@ -123,7 +123,7 @@ - + m_RecursiveCheck @@ -145,14 +145,14 @@ m_RangeInput - + 40 40 - + m_useExternMerge @@ -194,10 +194,10 @@ externDisplayToggled(bool) - + externDisplayToggled(bool) - - + + kurlrequester.h klineedit.h diff --git a/src/svnfrontend/mergedlg_impl.cpp b/src/svnfrontend/mergedlg_impl.cpp index 28bb02e..ae45803 100644 --- a/src/svnfrontend/mergedlg_impl.cpp +++ b/src/svnfrontend/mergedlg_impl.cpp @@ -27,12 +27,12 @@ #include #include #include -#include -#include -#include +#include +#include +#include -MergeDlg_impl::MergeDlg_impl(QWidget *parent, const char *name,bool src1,bool src2,bool out) - :MergeDlg(parent, name) +MergeDlg_impl::MergeDlg_impl(TQWidget *tqparent, const char *name,bool src1,bool src2,bool out) + :MergeDlg(tqparent, name) { m_SrcOneInput->setMode(KFile::Directory|KFile::File); if (!src1) { @@ -53,7 +53,7 @@ MergeDlg_impl::MergeDlg_impl(QWidget *parent, const char *name,bool src1,bool sr m_OutLabel->hide(); } adjustSize(); - setMinimumSize(minimumSizeHint()); + setMinimumSize(tqminimumSizeHint()); m_useExternMerge->setChecked(Kdesvnsettings::extern_merge_default()); } @@ -61,7 +61,7 @@ MergeDlg_impl::~MergeDlg_impl() { } -void MergeDlg_impl::setSrc1(const QString&what) +void MergeDlg_impl::setSrc1(const TQString&what) { if (what.isEmpty()) { m_SrcOneInput->setURL(""); @@ -81,7 +81,7 @@ void MergeDlg_impl::setSrc1(const QString&what) m_SrcOneInput->setURL(uri.url()); } -void MergeDlg_impl::setSrc2(const QString&what) +void MergeDlg_impl::setSrc2(const TQString&what) { if (what.isEmpty()) { m_SrcTwoInput->setURL(""); @@ -100,7 +100,7 @@ void MergeDlg_impl::setSrc2(const QString&what) m_SrcTwoInput->setURL(uri.url()); } -void MergeDlg_impl::setDest(const QString&what) +void MergeDlg_impl::setDest(const TQString&what) { if (what.isEmpty()) { m_OutInput->setURL(""); @@ -136,10 +136,10 @@ bool MergeDlg_impl::useExtern()const return m_useExternMerge->isChecked(); } -QString MergeDlg_impl::Src1()const +TQString MergeDlg_impl::Src1()const { KURL uri(m_SrcOneInput->url()); - QString proto = svn::Url::transformProtokoll(uri.protocol()); + TQString proto = svn::Url::transformProtokoll(uri.protocol()); if (proto=="file"&&!m_SrcOneInput->url().startsWith("ksvn+file:")) { uri.setProtocol(""); } else { @@ -148,13 +148,13 @@ QString MergeDlg_impl::Src1()const return uri.url(); } -QString MergeDlg_impl::Src2()const +TQString MergeDlg_impl::Src2()const { if (m_SrcTwoInput->url().isEmpty()) { return ""; } KURL uri(m_SrcTwoInput->url()); - QString proto = svn::Url::transformProtokoll(uri.protocol()); + TQString proto = svn::Url::transformProtokoll(uri.protocol()); if (proto=="file"&&!m_SrcTwoInput->url().startsWith("ksvn+file:")) { uri.setProtocol(""); } else { @@ -163,7 +163,7 @@ QString MergeDlg_impl::Src2()const return uri.url(); } -QString MergeDlg_impl::Dest()const +TQString MergeDlg_impl::Dest()const { KURL uri(m_OutInput->url()); uri.setProtocol(""); @@ -181,17 +181,17 @@ Rangeinput_impl::revision_range MergeDlg_impl::getRange()const */ bool MergeDlg_impl::getMergeRange(Rangeinput_impl::revision_range&range,bool*force,bool*recursive,bool*ignorerelated,bool*dry, bool*useExternal, - QWidget*parent,const char*name) + TQWidget*tqparent,const char*name) { MergeDlg_impl*ptr = 0; - KDialogBase dlg(parent,name,true,i18n("Enter merge range"), + KDialogBase dlg(tqparent,name,true,i18n("Enter merge range"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Help, KDialogBase::Ok,true); dlg.setHelp("merging-items","kdesvn"); - QWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); ptr = new MergeDlg_impl(Dialog1Layout,"merge_range_dlg",false,false,false); - dlg.resize( QSize(480,360).expandedTo(dlg.minimumSizeHint()) ); - if (dlg.exec()!=QDialog::Accepted) { + dlg.resize( TQSize(480,360).expandedTo(dlg.tqminimumSizeHint()) ); + if (dlg.exec()!=TQDialog::Accepted) { return false; } range = ptr->getRange(); diff --git a/src/svnfrontend/mergedlg_impl.h b/src/svnfrontend/mergedlg_impl.h index 90dc3d8..1a2df6f 100644 --- a/src/svnfrontend/mergedlg_impl.h +++ b/src/svnfrontend/mergedlg_impl.h @@ -25,8 +25,9 @@ class MergeDlg_impl: public MergeDlg { Q_OBJECT + TQ_OBJECT public: - MergeDlg_impl(QWidget *parent = 0, const char *name = 0,bool src1=true,bool src2=true,bool out=true); + MergeDlg_impl(TQWidget *tqparent = 0, const char *name = 0,bool src1=true,bool src2=true,bool out=true); virtual ~MergeDlg_impl(); bool recursive()const; @@ -35,17 +36,17 @@ public: bool dryrun()const; bool useExtern()const; - QString Src1()const; - QString Src2()const; - QString Dest()const; + TQString Src1()const; + TQString Src2()const; + TQString Dest()const; Rangeinput_impl::revision_range getRange()const; - void setSrc1(const QString&); - void setSrc2(const QString&); - void setDest(const QString&); + void setSrc1(const TQString&); + void setSrc2(const TQString&); + void setDest(const TQString&); static bool getMergeRange(Rangeinput_impl::revision_range&range, - bool*force,bool*recursive,bool*ignorerelated,bool*dry,bool*useExternal,QWidget*parent=0,const char*name=0); + bool*force,bool*recursive,bool*ignorerelated,bool*dry,bool*useExternal,TQWidget*tqparent=0,const char*name=0); protected slots: virtual void externDisplayToggled(bool); diff --git a/src/svnfrontend/modifiedthread.cpp b/src/svnfrontend/modifiedthread.cpp index f7f6c90..21b71d5 100644 --- a/src/svnfrontend/modifiedthread.cpp +++ b/src/svnfrontend/modifiedthread.cpp @@ -23,17 +23,17 @@ #include "src/svnqt/svnqttypes.hpp" -#include +#include #include #include -CheckModifiedThread::CheckModifiedThread(QObject*_parent,const QString&what,bool _updates) - : QThread(),mutex(),m_ContextListener(0) +CheckModifiedThread::CheckModifiedThread(TQObject*_tqparent,const TQString&what,bool _updates) + : TQThread(),mutex(),m_ContextListener(0) { - m_Parent = _parent; + m_Parent = _tqparent; m_CurrentContext = new svn::Context(); m_ContextListener = new ThreadContextListener(m_Parent); - QObject::connect(m_ContextListener,SIGNAL(sendNotify(const QString&)),m_Parent,SLOT(slotNotifyMessage(const QString&))); + TQObject::connect(m_ContextListener,TQT_SIGNAL(sendNotify(const TQString&)),m_Parent,TQT_SLOT(slotNotifyMessage(const TQString&))); m_CurrentContext->setListener(m_ContextListener); m_what = what; @@ -63,7 +63,7 @@ void CheckModifiedThread::run() { // what must be cleaned! svn::Revision where = svn::Revision::HEAD; - QString ex; + TQString ex; try { // rec all up noign m_Cache = m_Svnclient->status(m_what,svn::DepthInfinity,false,m_updates,false,where); @@ -72,7 +72,7 @@ void CheckModifiedThread::run() } KApplication*k = KApplication::kApplication(); if (k) { - QCustomEvent*ev = new QCustomEvent(EVENT_THREAD_FINISHED); + TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_FINISHED); ev->setData((void*)this); k->postEvent(m_Parent,ev); } diff --git a/src/svnfrontend/modifiedthread.h b/src/svnfrontend/modifiedthread.h index 93028e8..ea8a58c 100644 --- a/src/svnfrontend/modifiedthread.h +++ b/src/svnfrontend/modifiedthread.h @@ -27,27 +27,27 @@ #include "eventnumbers.h" #include "frontendtypes.h" -#include -#include +#include +#include -class QObject; +class TQObject; -class CheckModifiedThread:public QThread +class CheckModifiedThread:public TQThread { public: - CheckModifiedThread(QObject*,const QString&what,bool _updates=false); + CheckModifiedThread(TQObject*,const TQString&what,bool _updates=false); virtual ~CheckModifiedThread(); virtual void run(); virtual void cancelMe(); virtual const svn::StatusEntries&getList()const; protected: - QMutex mutex; + TQMutex mutex; svn::Client* m_Svnclient; svn::ContextP m_CurrentContext; ThreadContextListenerP m_ContextListener; - QObject*m_Parent; - QString m_what; + TQObject*m_Parent; + TQString m_what; bool m_updates; svn::StatusEntries m_Cache; }; diff --git a/src/svnfrontend/opencontextmenu.cpp b/src/svnfrontend/opencontextmenu.cpp index 796ac22..857f02c 100644 --- a/src/svnfrontend/opencontextmenu.cpp +++ b/src/svnfrontend/opencontextmenu.cpp @@ -22,8 +22,8 @@ #include #include -OpenContextmenu::OpenContextmenu(const KURL&aPath,const KTrader::OfferList&aList,QWidget* parent, const char* name) - : QPopupMenu(parent, name),m_Path(aPath),m_List(aList) +OpenContextmenu::OpenContextmenu(const KURL&aPath,const KTrader::OfferList&aList,TQWidget* tqparent, const char* name) + : TQPopupMenu(tqparent, name),m_Path(aPath),m_List(aList) { setup(); } @@ -42,12 +42,12 @@ void OpenContextmenu::setup() if ((*it)->noDisplay()) continue; - QCString nam; + TQCString nam; nam.setNum( id ); - QString actionName( (*it)->name().replace("&", "&&") ); + TQString actionName( (*it)->name().tqreplace("&", "&&") ); act = new KAction( actionName, (*it)->pixmap( KIcon::Small ), 0, - this, SLOT( slotRunService() ), this, nam.prepend( "appservice_" ) ); + TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ), TQT_TQOBJECT(this), nam.prepend( "appservice_" ) ); act->plug(this); m_mapPopup[ id++ ] = *it; } @@ -55,16 +55,16 @@ void OpenContextmenu::setup() insertSeparator( ); } act = new KAction(i18n("Other..."),0, 0, - this, SLOT( slotOpenWith() ),this,"openwith"); + TQT_TQOBJECT(this), TQT_SLOT( slotOpenWith() ),TQT_TQOBJECT(this),"openwith"); act->plug(this); } void OpenContextmenu::slotRunService() { - QCString senderName = sender()->name(); - int id = senderName.mid( senderName.find( '_' ) + 1 ).toInt(); + TQCString senderName = TQT_TQOBJECT(const_cast(sender()))->name(); + int id = senderName.mid( senderName.tqfind( '_' ) + 1 ).toInt(); - QMap::Iterator it = m_mapPopup.find( id ); + TQMap::Iterator it = m_mapPopup.tqfind( id ); if ( it != m_mapPopup.end() ) { KRun::run( **it, m_Path ); diff --git a/src/svnfrontend/opencontextmenu.h b/src/svnfrontend/opencontextmenu.h index 0ec106b..682e278 100644 --- a/src/svnfrontend/opencontextmenu.h +++ b/src/svnfrontend/opencontextmenu.h @@ -23,22 +23,23 @@ #include #include #include -#include -#include +#include +#include /** @author Rajko Albrecht */ -class OpenContextmenu : public QPopupMenu +class OpenContextmenu : public TQPopupMenu { Q_OBJECT + TQ_OBJECT public: - OpenContextmenu(const KURL&,const KTrader::OfferList&,QWidget* parent, const char* name); + OpenContextmenu(const KURL&,const KTrader::OfferList&,TQWidget* tqparent, const char* name); virtual ~OpenContextmenu(); protected: KURL m_Path; KTrader::OfferList m_List; - QMap m_mapPopup; + TQMap m_mapPopup; void setup(); diff --git a/src/svnfrontend/propertiesdlg.cpp b/src/svnfrontend/propertiesdlg.cpp index 4203765..7bef811 100644 --- a/src/svnfrontend/propertiesdlg.cpp +++ b/src/svnfrontend/propertiesdlg.cpp @@ -25,36 +25,36 @@ #include "svnitem.h" #include "src/svnqt/client.hpp" -#include -#include -#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include #include /* - * Constructs a PropertiesDlg as a child of 'parent', with the + * Constructs a PropertiesDlg as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -PropertiesDlg::PropertiesDlg(SvnItem*which, svn::Client*aClient, const svn::Revision&aRev, QWidget* parent, const char* name, bool modal) +PropertiesDlg::PropertiesDlg(SvnItem*which, svn::Client*aClient, const svn::Revision&aRev, TQWidget* tqparent, const char* name, bool modal) : - KDialogBase(parent,name,modal,i18n("Modify properties"),Ok|Cancel/*|Help|User1|User2*/, Ok, + KDialogBase(tqparent,name,modal,i18n("Modify properties"),Ok|Cancel/*|Help|User1|User2*/, Ok, true/*, KStdGuiItem::add(),KStdGuiItem::remove() */), m_Item(which),m_changed(false), m_Client(aClient),m_Rev(aRev) { if ( !name ) setName( "PropertiesDlg" ); - QWidget * m = makeMainWidget(); - PropertiesDlgLayout = new QHBoxLayout(m, marginHint(), spacingHint(), "PropertiesDlgLayout"); + TQWidget * m = makeMainWidget(); + PropertiesDlgLayout = new TQHBoxLayout(m, marginHint(), spacingHint(), "PropertiesDlgLayout"); m_PropertiesListview = new Propertylist(m, "m_PropertiesListview" ); m_PropertiesListview->setAllColumnsShowFocus( TRUE ); @@ -67,14 +67,14 @@ PropertiesDlg::PropertiesDlg(SvnItem*which, svn::Client*aClient, const svn::Revi m_PropertiesListview->setFullWidth( TRUE ); PropertiesDlgLayout->addWidget( m_PropertiesListview); - m_rightLayout = new QVBoxLayout(0, marginHint(), spacingHint(), "m_rightLayout"); + m_rightLayout = new TQVBoxLayout(0, marginHint(), spacingHint(), "m_rightLayout"); m_AddButton = new KPushButton(m, "m_AddButton" ); m_rightLayout->addWidget( m_AddButton ); m_ModifyButton = new KPushButton(m, "m_ModifyButton" ); m_rightLayout->addWidget( m_ModifyButton ); m_DeleteButton = new KPushButton(m, "m_DeleteButton" ); m_rightLayout->addWidget( m_DeleteButton ); - m_rightSpacer = new QSpacerItem( 20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding ); + m_rightSpacer = new TQSpacerItem( 20, 40, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_rightLayout->addItem(m_rightSpacer); PropertiesDlgLayout->addLayout(m_rightLayout); m_DeleteButton->setEnabled(false); @@ -85,12 +85,12 @@ PropertiesDlg::PropertiesDlg(SvnItem*which, svn::Client*aClient, const svn::Revi clearWState( WState_Polished ); // signals and slots connections - connect( m_AddButton, SIGNAL(clicked()), this, SLOT(slotAdd())); - connect( m_ModifyButton, SIGNAL(clicked()), this, SLOT(slotModify())); - connect( m_DeleteButton, SIGNAL(clicked()), this, SLOT(slotDelete())); - connect(this,SIGNAL(helpClicked()),SLOT(slotHelp())); - connect(m_PropertiesListview,SIGNAL(selectionChanged(QListViewItem*)),this,SLOT(slotSelectionChanged(QListViewItem*))); -// connect(m_PropertiesListview,SIGNAL(executed(QListViewItem*)),this,SLOT(slotSelectionExecuted(QListViewItem*))); + connect( m_AddButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdd())); + connect( m_ModifyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotModify())); + connect( m_DeleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelete())); + connect(this,TQT_SIGNAL(helpClicked()),TQT_SLOT(slotHelp())); + connect(m_PropertiesListview,TQT_SIGNAL(selectionChanged(TQListViewItem*)),this,TQT_SLOT(slotSelectionChanged(TQListViewItem*))); +// connect(m_PropertiesListview,TQT_SIGNAL(executed(TQListViewItem*)),this,TQT_SLOT(slotSelectionExecuted(TQListViewItem*))); if (!m_Client) { m_PropertiesListview->setEnabled(false); @@ -107,7 +107,7 @@ bool PropertiesDlg::hasChanged()const */ PropertiesDlg::~PropertiesDlg() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -117,7 +117,7 @@ PropertiesDlg::~PropertiesDlg() void PropertiesDlg::languageChange() { setCaption( i18n("View and modify properties") ); - QToolTip::add(m_PropertiesListview, i18n( "List of properties set" )); + TQToolTip::add(m_PropertiesListview, i18n( "List of properties set" )); m_AddButton->setText(i18n("Add property")); m_ModifyButton->setText(i18n("Modify property")); m_DeleteButton->setText(i18n("Delete property")); @@ -128,7 +128,7 @@ void PropertiesDlg::slotHelp() qWarning( "PropertiesDlg::slotHelp(): Not implemented yet" ); } -void PropertiesDlg::slotSelectionChanged(QListViewItem*item) +void PropertiesDlg::slotSelectionChanged(TQListViewItem*item) { m_DeleteButton->setEnabled(item); m_ModifyButton->setEnabled(item); @@ -153,7 +153,7 @@ void PropertiesDlg::slotSelectionChanged(QListViewItem*item) */ void PropertiesDlg::initItem() { - QString ex; + TQString ex; if (!m_Client) { ex = i18n("Missing SVN link"); emit clientException(ex); @@ -186,9 +186,9 @@ void PropertiesDlg::polish() } /*! - \fn PropertiesDlg::slotSelectionExecuted(QListViewItem*) + \fn PropertiesDlg::slotSelectionExecuted(TQListViewItem*) */ -void PropertiesDlg::slotSelectionExecuted(QListViewItem*) +void PropertiesDlg::slotSelectionExecuted(TQListViewItem*) { } @@ -200,7 +200,7 @@ void PropertiesDlg::slotAdd() /// @TODO Use a object variable to store a reference to dlg for further reuse EditProperty_impl dlg(this); dlg.setDir(m_Item->isDir()); - if (dlg.exec()==QDialog::Accepted) { + if (dlg.exec()==TQDialog::Accepted) { if (PropertyListViewItem::protected_Property(dlg.propName())) { KMessageBox::error(this,i18n("This property may not set by users.\nRejecting it."),i18n("Protected property")); return; @@ -223,7 +223,7 @@ void PropertiesDlg::slotAdd() */ void PropertiesDlg::slotDelete() { - QListViewItem*qi = m_PropertiesListview->selectedItem(); + TQListViewItem*qi = m_PropertiesListview->selectedItem(); if (!qi) return; PropertyListViewItem*ki = static_cast (qi); if (PropertyListViewItem::protected_Property(ki->currentName())) return; @@ -241,7 +241,7 @@ void PropertiesDlg::slotDelete() */ void PropertiesDlg::slotModify() { - QListViewItem*qi = m_PropertiesListview->selectedItem(); + TQListViewItem*qi = m_PropertiesListview->selectedItem(); if (!qi) return; PropertyListViewItem*ki = static_cast (qi); if (PropertyListViewItem::protected_Property(ki->currentName())) return; @@ -250,7 +250,7 @@ void PropertiesDlg::slotModify() dlg.setDir(m_Item->isDir()); dlg.setPropName(ki->currentName()); dlg.setPropValue(ki->currentValue()); - if (dlg.exec()==QDialog::Accepted) { + if (dlg.exec()==TQDialog::Accepted) { if (PropertyListViewItem::protected_Property(dlg.propName())) { KMessageBox::error(this,i18n("This property may not set by users.\nRejecting it."),i18n("Protected property")); return; @@ -266,11 +266,11 @@ void PropertiesDlg::slotModify() } } -void PropertiesDlg::changedItems(svn::PropertiesMap&toSet,QValueList&toDelete) +void PropertiesDlg::changedItems(svn::PropertiesMap&toSet,TQValueList&toDelete) { toSet.clear(); toDelete.clear(); - QListViewItemIterator iter( m_PropertiesListview ); + TQListViewItemIterator iter( m_PropertiesListview ); PropertyListViewItem*ki; while ( iter.current() ) { ki = static_cast (iter.current()); diff --git a/src/svnfrontend/propertiesdlg.h b/src/svnfrontend/propertiesdlg.h index 006ad0a..9805f32 100644 --- a/src/svnfrontend/propertiesdlg.h +++ b/src/svnfrontend/propertiesdlg.h @@ -20,22 +20,22 @@ #ifndef PROPERTIESDLG_H #define PROPERTIESDLG_H -#include +#include #include -#include -#include -#include +#include +#include +#include #include "src/svnqt/svnqttypes.hpp" #include "src/svnqt/revision.hpp" -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QSpacerItem; -class QLabel; +class TQVBoxLayout; +class TQHBoxLayout; +class TQGridLayout; +class TQSpacerItem; +class TQLabel; class Propertylist; -class QListViewItem; +class TQListViewItem; class KPushButton; class FileListViewItem; class SvnItem; @@ -47,15 +47,16 @@ namespace svn { class PropertiesDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: PropertiesDlg(SvnItem*, svn::Client*, const svn::Revision&aRev=svn::Revision(svn_opt_revision_working), - QWidget* parent = 0, const char* name = 0, bool modal = true); + TQWidget* tqparent = 0, const char* name = 0, bool modal = true); ~PropertiesDlg(); bool hasChanged()const; - void changedItems(svn::PropertiesMap&toSet,QValueList&toDelete); + void changedItems(svn::PropertiesMap&toSet,TQValueList&toDelete); protected: Propertylist* m_PropertiesListview; @@ -63,9 +64,9 @@ protected: KPushButton* m_DeleteButton; KPushButton* m_ModifyButton; - QHBoxLayout* PropertiesDlgLayout; - QVBoxLayout* m_rightLayout; - QSpacerItem* m_rightSpacer; + TQHBoxLayout* PropertiesDlgLayout; + TQVBoxLayout* m_rightLayout; + TQSpacerItem* m_rightSpacer; SvnItem *m_Item; bool m_changed; @@ -77,8 +78,8 @@ protected slots: virtual void languageChange(); virtual void slotHelp(); - virtual void slotSelectionChanged(QListViewItem*); - virtual void slotSelectionExecuted(QListViewItem*); + virtual void slotSelectionChanged(TQListViewItem*); + virtual void slotSelectionExecuted(TQListViewItem*); virtual void slotAdd(); virtual void slotDelete(); virtual void slotModify(); @@ -91,7 +92,7 @@ public slots: virtual void polish(); signals: - void clientException(const QString&); + void clientException(const TQString&); }; #endif // PROPERTIESDLG_H diff --git a/src/svnfrontend/simple_logcb.h b/src/svnfrontend/simple_logcb.h index 71f6d1d..14b3365 100644 --- a/src/svnfrontend/simple_logcb.h +++ b/src/svnfrontend/simple_logcb.h @@ -26,7 +26,7 @@ namespace svn class Revision; } -class QString; +class TQString; //! Helper for getting specific svn logentries class SimpleLogCb @@ -45,7 +45,7 @@ public: * @param root the root repository of item, if not given, it has to get detected in implementation from \a what and used. * @return true if logentry and root found, otherwise false. */ - virtual bool getSingleLog(svn::LogEntry&logtarget,const svn::Revision&rev,const QString&what,const svn::Revision&peg,QString&root) = 0; + virtual bool getSingleLog(svn::LogEntry&logtarget,const svn::Revision&rev,const TQString&what,const svn::Revision&peg,TQString&root) = 0; }; #endif diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp index 06bee04..6030b17 100644 --- a/src/svnfrontend/stopdlg.cpp +++ b/src/svnfrontend/stopdlg.cpp @@ -25,17 +25,17 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include -StopDlg::StopDlg(QObject*listener,QWidget *parent, const char *name,const QString&caption,const QString&text) - : KDialogBase(KDialogBase::Plain,caption,KDialogBase::Cancel, KDialogBase::Cancel,parent, name,true) +StopDlg::StopDlg(TQObject*listener,TQWidget *tqparent, const char *name,const TQString&caption,const TQString&text) + : KDialogBase(KDialogBase::Plain,caption,KDialogBase::Cancel, KDialogBase::Cancel,tqparent, name,true) ,m_Context(listener),m_MinDuration(1000),mCancelled(false),mShown(false),m_BarShown(false), cstack(0) { @@ -43,44 +43,44 @@ StopDlg::StopDlg(QObject*listener,QWidget *parent, const char *name,const QStrin m_lastLogLines = 0; m_lastLog = ""; - mShowTimer = new QTimer(this); + mShowTimer = new TQTimer(this); m_StopTick.start(); showButton(KDialogBase::Close, false); mCancelText = actionButton(KDialogBase::Cancel)->text(); - QFrame* mainWidget = plainPage(); - layout = new QVBoxLayout(mainWidget, 10); - mLabel = new QLabel(text, mainWidget); - layout->addWidget(mLabel); + TQFrame* mainWidget = plainPage(); + tqlayout = new TQVBoxLayout(mainWidget, 10); + mLabel = new TQLabel(text, mainWidget); + tqlayout->addWidget(mLabel); m_ProgressBar=new KProgress(15,mainWidget); m_ProgressBar->setCenterIndicator (false); m_ProgressBar->setTextEnabled(false); - layout->addWidget(m_ProgressBar); + tqlayout->addWidget(m_ProgressBar); m_NetBar = new KProgress(15,mainWidget); - layout->addWidget(m_NetBar); + tqlayout->addWidget(m_NetBar); mWait = false; m_LogWindow = 0; - connect(mShowTimer, SIGNAL(timeout()), this, SLOT(slotAutoShow())); + connect(mShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoShow())); if (m_Context) { - connect(m_Context,SIGNAL(tickProgress()),this,SLOT(slotTick())); - connect(m_Context,SIGNAL(waitShow(bool)),this,SLOT(slotWait(bool))); - connect(m_Context,SIGNAL(netProgress(long long int, long long int)), - this,SLOT(slotNetProgres(long long int, long long int))); - connect(this,SIGNAL(sigCancel(bool)),m_Context,SLOT(setCanceled(bool))); + connect(m_Context,TQT_SIGNAL(tickProgress()),this,TQT_SLOT(slotTick())); + connect(m_Context,TQT_SIGNAL(waitShow(bool)),this,TQT_SLOT(slotWait(bool))); + connect(m_Context,TQT_SIGNAL(netProgress(long long int, long long int)), + this,TQT_SLOT(slotNetProgres(long long int, long long int))); + connect(this,TQT_SIGNAL(sigCancel(bool)),m_Context,TQT_SLOT(setCanceled(bool))); } mShowTimer->start(m_MinDuration, true); setMinimumSize(280,160); adjustSize(); } -void StopDlg::showEvent( QShowEvent*) +void StopDlg::showEvent( TQShowEvent*) { - cstack = new CursorStack(Qt::BusyCursor); + cstack = new CursorStack(TQt::BusyCursor); } -void StopDlg::hideEvent(QHideEvent*) +void StopDlg::hideEvent(TQHideEvent*) { delete cstack; cstack = 0; } @@ -102,8 +102,8 @@ StopDlg::~StopDlg() void StopDlg::slotAutoShow() { bool hasDialogs = false; - QWidget * w = kapp->activeModalWidget(); - if (w && w!=this && w!=parentWidget() ) { + TQWidget * w = TQT_TQWIDGET(kapp->activeModalWidget()); + if (w && w!=this && w!=tqparentWidget() ) { hasDialogs = true; } if (hasDialogs) { @@ -156,15 +156,15 @@ void StopDlg::slotTick() } } -void StopDlg::slotExtraMessage(const QString&msg) +void StopDlg::slotExtraMessage(const TQString&msg) { ++m_lastLogLines; if (!m_LogWindow) { - QFrame* mainWidget = plainPage(); + TQFrame* mainWidget = plainPage(); m_LogWindow = new KTextBrowser(mainWidget); - layout->addWidget(m_LogWindow); + tqlayout->addWidget(m_LogWindow); m_LogWindow->show(); - resize( QSize(500, 400).expandedTo(minimumSizeHint()) ); + resize( TQSize(500, 400).expandedTo(tqminimumSizeHint()) ); } if (m_lastLogLines >= Kdesvnsettings::self()->cmdline_log_minline() && isHidden() ) { @@ -181,14 +181,14 @@ void StopDlg::slotNetProgres(long long int current, long long int max) m_NetBar->show(); m_netBarShown=true; } - QString s1 = helpers::ByteToString()(current); + TQString s1 = helpers::ByteToString()(current); if (max > -1 && max != m_NetBar->totalSteps()) { - QString s2 = helpers::ByteToString()(max); - m_NetBar->setFormat(i18n("%1 of %2").arg(s1).arg(s2)); + TQString s2 = helpers::ByteToString()(max); + m_NetBar->setFormat(i18n("%1 of %2").tqarg(s1).tqarg(s2)); m_NetBar->setTotalSteps(max); } if (max == -1) { - m_NetBar->setFormat(i18n("%1 transferred.").arg(s1)); + m_NetBar->setFormat(i18n("%1 transferred.").tqarg(s1)); m_NetBar->setTotalSteps(current+1); } m_NetBar->setValue(current); @@ -197,10 +197,10 @@ void StopDlg::slotNetProgres(long long int current, long long int max) } } -StopSimpleDlg::StopSimpleDlg(QWidget *parent, const char *name,const QString&caption,const QString&text) - : StopDlg(0,parent,name,caption,text),cancelld(false) +StopSimpleDlg::StopSimpleDlg(TQWidget *tqparent, const char *name,const TQString&caption,const TQString&text) + : StopDlg(0,tqparent,name,caption,text),cancelld(false) { - connect(this,SIGNAL(sigCancel(bool)),this,SLOT(slotSimpleCancel(bool))); + connect(this,TQT_SIGNAL(sigCancel(bool)),this,TQT_SLOT(slotSimpleCancel(bool))); } void StopSimpleDlg::slotSimpleCancel(bool how) diff --git a/src/svnfrontend/stopdlg.h b/src/svnfrontend/stopdlg.h index 5d33d59..1a9813d 100644 --- a/src/svnfrontend/stopdlg.h +++ b/src/svnfrontend/stopdlg.h @@ -24,16 +24,16 @@ #include -#include -#include +#include +#include -class QTimer; +class TQTimer; class CContextListener; -class QLabel; +class TQLabel; class KProgress; class KTextBrowser; -class QVBoxLayout; +class TQVBoxLayout; /** @author Rajko Albrecht @@ -41,39 +41,40 @@ class QVBoxLayout; class StopDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - StopDlg(QObject*,QWidget *parent = 0, const char *name = 0,const QString&caption=QString::null,const QString&text=QString::null); + StopDlg(TQObject*,TQWidget *tqparent = 0, const char *name = 0,const TQString&caption=TQString(),const TQString&text=TQString()); virtual ~StopDlg(); bool cancelld(); protected: - QObject*m_Context; + TQObject*m_Context; int m_MinDuration; bool mCancelled; - QTimer * mShowTimer; - QString mCancelText; + TQTimer * mShowTimer; + TQString mCancelText; bool mShown,mWait; - QLabel*mLabel; + TQLabel*mLabel; KProgress*m_ProgressBar; KProgress*m_NetBar; bool m_BarShown; bool m_netBarShown; - QTime m_StopTick; + TQTime m_StopTick; KTextBrowser*m_LogWindow; - QVBoxLayout*layout; + TQVBoxLayout*tqlayout; - QString m_lastLog; + TQString m_lastLog; unsigned int m_lastLogLines; CursorStack * cstack; - virtual void showEvent(QShowEvent*); - virtual void hideEvent(QHideEvent*); + virtual void showEvent(TQShowEvent*); + virtual void hideEvent(TQHideEvent*); public slots: virtual void slotTick(); virtual void slotWait(bool); - virtual void slotExtraMessage(const QString&); + virtual void slotExtraMessage(const TQString&); protected slots: virtual void slotAutoShow(); @@ -86,8 +87,9 @@ signals: class StopSimpleDlg:public StopDlg { Q_OBJECT + TQ_OBJECT public: - StopSimpleDlg(QWidget *parent = 0, const char *name = 0,const QString&caption=QString::null,const QString&text=QString::null); + StopSimpleDlg(TQWidget *tqparent = 0, const char *name = 0,const TQString&caption=TQString(),const TQString&text=TQString()); virtual ~StopSimpleDlg(){} bool isCanceld()const{return cancelld;} diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp index 082666f..390f480 100644 --- a/src/svnfrontend/svnactions.cpp +++ b/src/svnfrontend/svnactions.cpp @@ -75,22 +75,22 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include // wait not longer than 10 seconds for a thread #define MAX_THREAD_WAITTIME 10000 @@ -116,15 +116,15 @@ public: delete m_LogDialog; } - QMap::iterator it; + TQMap::iterator it; for (it=m_tempfilelist.begin();it!=m_tempfilelist.end();++it) { - for (QStringList::iterator it2 = (*it).begin(); + for (TQStringList::iterator it2 = (*it).begin(); it2 != (*it).end();++it2) { ::unlink((*it2).ascii()); } } for (it=m_tempdirlist.begin();it!=m_tempdirlist.end();++it) { - for (QStringList::iterator it2 = (*it).begin(); + for (TQStringList::iterator it2 = (*it).begin(); it2 != (*it).end();++it2) { KIO::NetAccess::del((*it2),0); } @@ -136,9 +136,9 @@ public: bool isExternalDiff() { if (Kdesvnsettings::use_external_diff()) { - QString edisp = Kdesvnsettings::external_diff_display(); - QStringList wlist = QStringList::split(" ",edisp); - if (wlist.count()>=3 && edisp.find("%1")!=-1 && edisp.find("%2")!=-1) { + TQString edisp = Kdesvnsettings::external_diff_display(); + TQStringList wlist = TQStringList::split(" ",edisp); + if (wlist.count()>=3 && edisp.tqfind("%1")!=-1 && edisp.tqfind("%2")!=-1) { return true; } } @@ -180,17 +180,17 @@ public: /// \todo as persistent cache (sqlite?) helpers::itemCache m_InfoCache; - QMap m_tempfilelist; - QMap m_tempdirlist; + TQMap m_tempfilelist; + TQMap m_tempdirlist; - QTimer m_ThreadCheckTimer; - QTimer m_UpdateCheckTimer; - QTime m_UpdateCheckTick; - QGuardedPtr m_DiffBrowserPtr; - QGuardedPtr m_DiffDialog; - QGuardedPtr m_LogDialog; + TQTimer m_ThreadCheckTimer; + TQTimer m_UpdateCheckTimer; + TQTime m_UpdateCheckTick; + TQGuardedPtr m_DiffBrowserPtr; + TQGuardedPtr m_DiffDialog; + TQGuardedPtr m_LogDialog; - QMap m_contextData; + TQMap m_contextData; bool runblocked; }; @@ -199,19 +199,19 @@ public: #define EMIT_REFRESH emit sigRefreshAll() #define DIALOGS_SIZES "display_dialogs_sizes" -SvnActions::SvnActions(ItemDisplay *parent, const char *name,bool processes_blocked) - : QObject(parent?parent->realWidget():0, name),SimpleLogCb() +SvnActions::SvnActions(ItemDisplay *tqparent, const char *name,bool processes_blocked) + : TQObject(tqparent?tqparent->realWidget():0, name),SimpleLogCb() { m_CThread = 0; m_UThread = 0; m_FCThread = 0; m_Data = new SvnActionsData(); - m_Data->m_ParentList = parent; + m_Data->m_ParentList = tqparent; m_Data->m_SvnContextListener = new CContextListener(this); m_Data->runblocked = processes_blocked; - connect(m_Data->m_SvnContextListener,SIGNAL(sendNotify(const QString&)),this,SLOT(slotNotifyMessage(const QString&))); - connect(&(m_Data->m_ThreadCheckTimer),SIGNAL(timeout()),this,SLOT(checkModthread())); - connect(&(m_Data->m_UpdateCheckTimer),SIGNAL(timeout()),this,SLOT(checkUpdateThread())); + connect(m_Data->m_SvnContextListener,TQT_SIGNAL(sendNotify(const TQString&)),this,TQT_SLOT(slotNotifyMessage(const TQString&))); + connect(&(m_Data->m_ThreadCheckTimer),TQT_SIGNAL(timeout()),this,TQT_SLOT(checkModthread())); + connect(&(m_Data->m_UpdateCheckTimer),TQT_SIGNAL(timeout()),this,TQT_SLOT(checkUpdateThread())); } svn::Client* SvnActions::svnclient() @@ -224,7 +224,7 @@ SvnActions::~SvnActions() killallThreads(); } -void SvnActions::slotNotifyMessage(const QString&aMsg) +void SvnActions::slotNotifyMessage(const TQString&aMsg) { emit sendNotify(aMsg); } @@ -239,7 +239,7 @@ void SvnActions::reInitClient() m_Data->m_Svnclient->setContext(m_Data->m_CurrentContext); } -template KDialogBase* SvnActions::createDialog(T**ptr,const QString&_head,bool OkCancel,const char*name,bool showHelp,bool modal,const KGuiItem&u1) +template KDialogBase* SvnActions::createDialog(T**ptr,const TQString&_head,bool OkCancel,const char*name,bool showHelp,bool modal,const KGuiItem&u1) { int buttons = KDialogBase::Ok; if (OkCancel) { @@ -252,18 +252,18 @@ template KDialogBase* SvnActions::createDialog(T**ptr,const QString&_he buttons = buttons|KDialogBase::User1; } KDialogBase * dlg = new KDialogBase( - modal?KApplication::activeModalWidget():0, // parent + modal?TQT_TQWIDGET(TQT_TQWIDGET(KApplication::activeModalWidget())):0, // tqparent name, // name modal, // modal _head, // caption - buttons, // buttonmask + buttons, // buttontqmask KDialogBase::Ok, // defaultButton false , // separator (u1.text().isEmpty()?KGuiItem():u1) //user1 ); if (!dlg) return dlg; - QWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); *ptr = new T(Dialog1Layout); dlg->resize(dlg->configDialogSize(*(Kdesvnsettings::self()->config()),name?name:DIALOGS_SIZES)); return dlg; @@ -279,8 +279,8 @@ void SvnActions::makeLog(const svn::Revision&start,const svn::Revision&end,const } } -svn::SharedPointer SvnActions::getLog(const svn::Revision&start,const svn::Revision&end,const svn::Revision&peg,const QString&which,bool list_files, - int limit,QWidget*parent) +svn::SharedPointer SvnActions::getLog(const svn::Revision&start,const svn::Revision&end,const svn::Revision&peg,const TQString&which,bool list_files, + int limit,TQWidget*tqparent) { svn::SharedPointer logs = new svn::LogEntriesMap; if (!m_Data->m_CurrentContext) return 0; @@ -289,9 +289,9 @@ svn::SharedPointer SvnActions::getLog(const svn::Revision&st kdDebug()<<"Get logs for "<< which<m_SvnContextListener,(parent?parent:m_Data->m_ParentList->realWidget()),0,"Logs", + StopDlg sdlg(m_Data->m_SvnContextListener,(tqparent?tqparent:m_Data->m_ParentList->realWidget()),0,"Logs", i18n("Getting logs - hit cancel for abort")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); if (doNetworking()) { m_Data->m_Svnclient->log(which,start,end,*logs,peg,list_files,!follow,limit); } else { @@ -303,7 +303,7 @@ svn::SharedPointer SvnActions::getLog(const svn::Revision&st m_Data->m_Svnclient->log(which,start,end,*logs,peg,list_files,!follow,limit); } else { svn::cache::ReposLog rl(m_Data->m_Svnclient,e.reposRoot()); - QString s1,s2,what; + TQString s1,s2,what; s1=e.url().mid(e.reposRoot().length()); if (which==".") { what=s1; @@ -325,7 +325,7 @@ svn::SharedPointer SvnActions::getLog(const svn::Revision&st return logs; } -bool SvnActions::getSingleLog(svn::LogEntry&t,const svn::Revision&r,const QString&what,const svn::Revision&peg,QString&root) +bool SvnActions::getSingleLog(svn::LogEntry&t,const svn::Revision&r,const TQString&what,const svn::Revision&peg,TQString&root) { bool res = false; @@ -345,7 +345,7 @@ bool SvnActions::getSingleLog(svn::LogEntry&t,const svn::Revision&r,const QStrin svn::LogEntriesMap _m; try { svn::cache::ReposLog rl(m_Data->m_Svnclient ,root); - if (rl.isValid() && rl.simpleLog(_m,r,r,true) && _m.find(r.revnum())!=_m.end() ) { + if (rl.isValid() && rl.simpleLog(_m,r,r,true) && _m.tqfind(r.revnum())!=_m.end() ) { t = _m[r.revnum()]; res = true; } @@ -357,7 +357,7 @@ bool SvnActions::getSingleLog(svn::LogEntry&t,const svn::Revision&r,const QStrin if (!res) { svn::SharedPointer log = getLog(r,r,peg,root,true,1); if (log) { - if (log->find(r.revnum())!=log->end()) { + if (log->tqfind(r.revnum())!=log->end()) { t = (*log)[r.revnum()]; res = true; } @@ -366,12 +366,12 @@ bool SvnActions::getSingleLog(svn::LogEntry&t,const svn::Revision&r,const QStrin return res; } -bool SvnActions::singleInfo(const QString&what,const svn::Revision&_rev,svn::InfoEntry&target,const svn::Revision&_peg) +bool SvnActions::singleInfo(const TQString&what,const svn::Revision&_rev,svn::InfoEntry&target,const svn::Revision&_peg) { - QString url; - QString ex; - QString cacheKey; - QTime d; d.start(); + TQString url; + TQString ex; + TQString cacheKey; + TQTime d; d.start(); svn::Revision rev = _rev; svn::Revision peg = _peg; if (!m_Data->m_CurrentContext) return false; @@ -379,14 +379,14 @@ bool SvnActions::singleInfo(const QString&what,const svn::Revision&_rev,svn::Inf // working copy // url = svn::Wc::getUrl(what); url = what; - if (url.find("@")!=-1) { + if (url.tqfind("@")!=-1) { url+="@BASE"; } peg = svn::Revision::UNDEFINED; cacheKey=url; } else { KURL _uri = what; - QString prot = svn::Url::transformProtokoll(_uri.protocol()); + TQString prot = svn::Url::transformProtokoll(_uri.protocol()); _uri.setProtocol(prot); url = _uri.prettyURL(); if (peg==svn::Revision::UNDEFINED) @@ -428,24 +428,24 @@ bool SvnActions::singleInfo(const QString&what,const svn::Revision&_rev,svn::Inf return true; } -void SvnActions::makeTree(const QString&what,const svn::Revision&_rev,const svn::Revision&startr,const svn::Revision&endr) +void SvnActions::makeTree(const TQString&what,const svn::Revision&_rev,const svn::Revision&startr,const svn::Revision&endr) { svn::InfoEntry info; if (!singleInfo(what,_rev,info)) { return; } - QString reposRoot = info.reposRoot(); + TQString reposRoot = info.reposRoot(); bool restartCache = (m_FCThread && m_FCThread->running()); if (restartCache) { stopFillCache(); } kdDebug()<<"Logs for "<m_ParentList->realWidget(),"historylist",true,i18n("History of %1").arg(info.url().mid(reposRoot.length())), + TQWidget*disp; + KDialogBase dlg(m_Data->m_ParentList->realWidget(),"historylist",true,i18n("History of %1").tqarg(info.url().mid(reposRoot.length())), KDialogBase::Ok, KDialogBase::Ok,true); - QWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); RevisionTree rt(m_Data->m_Svnclient,m_Data->m_SvnContextListener,reposRoot, startr,endr, @@ -454,15 +454,15 @@ void SvnActions::makeTree(const QString&what,const svn::Revision&_rev,const svn: disp = rt.getView(); if (disp) { connect( - disp,SIGNAL(makeNorecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*)), - this,SLOT(makeNorecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*)) + disp,TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), + this,TQT_SLOT(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) ); connect( - disp,SIGNAL(makeRecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*)), - this,SLOT(makeDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*)) + disp,TQT_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), + this,TQT_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)) ); - connect(disp,SIGNAL(makeCat(const svn::Revision&, const QString&,const QString&,const svn::Revision&,QWidget*)), - this,SLOT(slotMakeCat(const svn::Revision&,const QString&,const QString&,const svn::Revision&,QWidget*))); + connect(disp,TQT_SIGNAL(makeCat(const svn::Revision&, const TQString&,const TQString&,const svn::Revision&,TQWidget*)), + this,TQT_SLOT(slotMakeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*))); dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()),"revisiontree_dlg")); dlg.exec(); dlg.saveDialogSize(*(Kdesvnsettings::self()->config()),"revisiontree_dlg",false); @@ -473,23 +473,23 @@ void SvnActions::makeTree(const QString&what,const svn::Revision&_rev,const svn: } } -void SvnActions::makeLog(const svn::Revision&start,const svn::Revision&end,const svn::Revision&peg,const QString&which,bool list_files,int limit) +void SvnActions::makeLog(const svn::Revision&start,const svn::Revision&end,const svn::Revision&peg,const TQString&which,bool list_files,int limit) { svn::InfoEntry info; if (!singleInfo(which,start,info)) { return; } - QString reposRoot = info.reposRoot(); + TQString reposRoot = info.reposRoot(); kdDebug()<<"getting logs..."< logs = getLog(start,end,peg,which,list_files,limit); if (!logs) return; - bool need_modal = m_Data->runblocked||KApplication::activeModalWidget()!=0; + bool need_modal = m_Data->runblocked||TQT_TQWIDGET(KApplication::activeModalWidget())!=0; if (need_modal||!m_Data->m_LogDialog) { m_Data->m_LogDialog=new SvnLogDlgImp(this,0,"logdialog",need_modal); - connect(m_Data->m_LogDialog,SIGNAL(makeDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*)), - this,SLOT(makeDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*))); - connect(m_Data->m_LogDialog,SIGNAL(makeCat(const svn::Revision&, const QString&,const QString&,const svn::Revision&,QWidget*)), - this,SLOT(slotMakeCat(const svn::Revision&,const QString&,const QString&,const svn::Revision&,QWidget*))); + connect(m_Data->m_LogDialog,TQT_SIGNAL(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), + this,TQT_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))); + connect(m_Data->m_LogDialog,TQT_SIGNAL(makeCat(const svn::Revision&, const TQString&,const TQString&,const svn::Revision&,TQWidget*)), + this,TQT_SLOT(slotMakeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*))); } if (m_Data->m_LogDialog) { @@ -516,19 +516,19 @@ void SvnActions::makeBlame(const svn::Revision&start, const svn::Revision&end, S if (k) makeBlame(start,end,k->fullName(),m_Data->m_ParentList->realWidget()); } -void SvnActions::makeBlame(const svn::Revision&start, const svn::Revision&end,const QString&k,QWidget*_p,const svn::Revision&_peg,SimpleLogCb*_acb) +void SvnActions::makeBlame(const svn::Revision&start, const svn::Revision&end,const TQString&k,TQWidget*_p,const svn::Revision&_peg,SimpleLogCb*_acb) { if (!m_Data->m_CurrentContext) return; svn::AnnotatedFile blame; - QString ex; + TQString ex; svn::Path p(k); - QWidget*_parent = _p?_p:m_Data->m_ParentList->realWidget(); + TQWidget*_tqparent = _p?_p:m_Data->m_ParentList->realWidget(); svn::Revision peg = _peg==svn::Revision::UNDEFINED?end:_peg; try { - CursorStack a(Qt::BusyCursor); - StopDlg sdlg(m_Data->m_SvnContextListener,_parent,0,"Annotate",i18n("Annotate lines - hit cancel for abort")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + CursorStack a(TQt::BusyCursor); + StopDlg sdlg(m_Data->m_SvnContextListener,_tqparent,0,"Annotate",i18n("Annotate lines - hit cancel for abort")); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->annotate(blame,p,start,end,peg); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -543,18 +543,18 @@ void SvnActions::makeBlame(const svn::Revision&start, const svn::Revision&end,co BlameDisplay_impl::displayBlame(_acb?_acb:this,k,blame,_p,"blame_dlg"); } -bool SvnActions::makeGet(const svn::Revision&start, const QString&what, const QString&target, - const svn::Revision&peg,QWidget*_dlgparent) +bool SvnActions::makeGet(const svn::Revision&start, const TQString&what, const TQString&target, + const svn::Revision&peg,TQWidget*_dlgtqparent) { if (!m_Data->m_CurrentContext) return false; - CursorStack a(Qt::BusyCursor); - QWidget*dlgp=_dlgparent?_dlgparent:m_Data->m_ParentList->realWidget(); - QString ex; + CursorStack a(TQt::BusyCursor); + TQWidget*dlgp=_dlgtqparent?_dlgtqparent:m_Data->m_ParentList->realWidget(); + TQString ex; svn::Path p(what); try { StopDlg sdlg(m_Data->m_SvnContextListener,dlgp, 0,"Content get",i18n("Getting content - hit cancel for abort")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->get(p,target,start,peg); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -567,11 +567,11 @@ bool SvnActions::makeGet(const svn::Revision&start, const QString&what, const QS return true; } -void SvnActions::slotMakeCat(const svn::Revision&start, const QString&what, const QString&disp,const svn::Revision&peg,QWidget*_dlgparent) +void SvnActions::slotMakeCat(const svn::Revision&start, const TQString&what, const TQString&disp,const svn::Revision&peg,TQWidget*_dlgtqparent) { KTempFile content; content.setAutoDelete(true); - if (!makeGet(start,what,content.name(),peg,_dlgparent)) { + if (!makeGet(start,what,content.name(),peg,_dlgtqparent)) { return; } EMIT_FINISHED; @@ -594,27 +594,27 @@ void SvnActions::slotMakeCat(const svn::Revision&start, const QString&what, cons return; } KTextBrowser*ptr; - QFile file(content.name()); + TQFile file(content.name()); file.open( IO_ReadOnly ); - QByteArray co = file.readAll(); + TQByteArray co = file.readAll(); if (co.size()) { - KDialogBase*dlg = createDialog(&ptr,QString(i18n("Content of %1")).arg(disp),false,"cat_display_dlg"); + KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Content of %1")).tqarg(disp),false,"cat_display_dlg"); if (dlg) { ptr->setFont(KGlobalSettings::fixedFont()); - ptr->setWordWrap(QTextEdit::NoWrap); - ptr->setText(QString::FROMUTF8(co,co.size())); + ptr->setWordWrap(TQTextEdit::NoWrap); + ptr->setText(TQString::FROMUTF8(co,co.size())); dlg->exec(); dlg->saveDialogSize(*(Kdesvnsettings::self()->config()),"cat_display_dlg",false); delete dlg; } } else { - KMessageBox::information(_dlgparent?_dlgparent:m_Data->m_ParentList->realWidget(), + KMessageBox::information(_dlgtqparent?_dlgtqparent:m_Data->m_ParentList->realWidget(), i18n("Got no content.")); } } -bool SvnActions::makeMkdir(const QStringList&which,const QString&logMessage) +bool SvnActions::makeMkdir(const TQStringList&which,const TQString&logMessage) { if (!m_Data->m_CurrentContext||which.count()<1) return false; svn::Targets targets(which); @@ -627,35 +627,35 @@ bool SvnActions::makeMkdir(const QStringList&which,const QString&logMessage) return true; } -QString SvnActions::makeMkdir(const QString&parentDir) +TQString SvnActions::makeMkdir(const TQString&tqparentDir) { - if (!m_Data->m_CurrentContext) return QString::null; - QString ex; + if (!m_Data->m_CurrentContext) return TQString(); + TQString ex; bool isOk=false; - ex = KInputDialog::getText(i18n("New folder"),i18n("Enter folder name:"),QString::null,&isOk); + ex = KInputDialog::getText(i18n("New folder"),i18n("Enter folder name:"),TQString(),&isOk); if (!isOk) { - return QString::null; + return TQString(); } - svn::Path target(parentDir); + svn::Path target(tqparentDir); target.addComponent(ex); ex = ""; - QString logMessage=QString::null; + TQString logMessage=TQString(); try { m_Data->m_Svnclient->mkdir(target,logMessage); }catch (const svn::Exception&e) { emit clientException(e.msg()); - return QString::null; + return TQString(); } ex = target.path(); return ex; } -QString SvnActions::getInfo(QPtrList lst,const svn::Revision&rev,const svn::Revision&peg,bool recursive,bool all) +TQString SvnActions::getInfo(TQPtrList lst,const svn::Revision&rev,const svn::Revision&peg,bool recursive,bool all) { - QStringList l; - QString res = ""; + TQStringList l; + TQString res = ""; SvnItem*item; for (item=lst.first();item;item=lst.next()) { if (all) res+="

"+item->fullName()+"

"; @@ -664,36 +664,36 @@ QString SvnActions::getInfo(QPtrList lst,const svn::Revision&rev,const return res; } -QString SvnActions::getInfo(const QString& _what,const svn::Revision&rev,const svn::Revision&peg,bool recursive,bool all) +TQString SvnActions::getInfo(const TQString& _what,const svn::Revision&rev,const svn::Revision&peg,bool recursive,bool all) { - if (!m_Data->m_CurrentContext) return QString::null; - QString ex; + if (!m_Data->m_CurrentContext) return TQString(); + TQString ex; svn::InfoEntries entries; if (recursive) { try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Details", i18n("Retrieving infos - hit cancel for abort")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); svn::InfoEntries e; entries = (m_Data->m_Svnclient->info(_what+ - (_what.find("@")>-1&&!svn::Url::isValid(_what)?"@BASE":""),recursive?svn::DepthInfinity:svn::DepthEmpty,rev,peg)); + (_what.tqfind("@")>-1&&!svn::Url::isValid(_what)?"@BASE":""),recursive?svn::DepthInfinity:svn::DepthEmpty,rev,peg)); } catch (const svn::Exception&e) { emit clientException(e.msg()); - return QString::null; + return TQString(); } } else { svn::InfoEntry info; if (!singleInfo(_what,rev,info,peg)) { - return QString::null; + return TQString(); } entries.append(info); } //if (!all) EMIT_FINISHED; - QString text = ""; + TQString text = ""; svn::InfoEntries::const_iterator it; - static QString rb = ""; - static QString re = "\n"; - static QString cs = ":"; + static TQString rb = ""; + static TQString re = "\n"; + static TQString cs = ":"; unsigned int val = 0; for (it=entries.begin();it!=entries.end();++it) { if (val>0) { @@ -791,7 +791,7 @@ QString SvnActions::getInfo(const QString& _what,const svn::Revision&rev,const s text+=rb+i18n("Lock comment")+cs+ (*it).lockEntry().Comment()+re; } else { - svn::SharedPointer d; + svn::SharedPointer d; if (checkReposLockCache(_what,d)&& d && d->lockEntry().Locked()) { text+=rb+i18n("Lock token")+cs+(d->lockEntry().Token())+re; text+=rb+i18n("Owner")+cs+(d->lockEntry().Owner())+re; @@ -808,13 +808,13 @@ QString SvnActions::getInfo(const QString& _what,const svn::Revision&rev,const s return text; } -void SvnActions::makeInfo(QPtrList lst,const svn::Revision&rev,const svn::Revision&peg,bool recursive) +void SvnActions::makeInfo(TQPtrList lst,const svn::Revision&rev,const svn::Revision&peg,bool recursive) { - QStringList l; - QString res = ""; + TQStringList l; + TQString res = ""; SvnItem*item; for (item=lst.first();item;item=lst.next()) { - QString text = getInfo(item->fullName(),rev,peg,recursive,true); + TQString text = getInfo(item->fullName(),rev,peg,recursive,true); if (!text.isEmpty()) { res+="

"+item->fullName()+"

"; res+=text; @@ -822,7 +822,7 @@ void SvnActions::makeInfo(QPtrList lst,const svn::Revision&rev,const sv } res+=""; KTextBrowser*ptr; - KDialogBase*dlg = createDialog(&ptr,QString(i18n("Infolist")),false,"info_dialog"); + KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Infolist")),false,"info_dialog"); if (dlg) { ptr->setText(res); dlg->exec(); @@ -831,11 +831,11 @@ void SvnActions::makeInfo(QPtrList lst,const svn::Revision&rev,const sv } } -void SvnActions::makeInfo(const QStringList&lst,const svn::Revision&rev,const svn::Revision&peg,bool recursive) +void SvnActions::makeInfo(const TQStringList&lst,const svn::Revision&rev,const svn::Revision&peg,bool recursive) { - QString text = ""; + TQString text = ""; for (unsigned int i=0; i < lst.count();++i) { - QString res = getInfo(lst[i],rev,peg,recursive,true); + TQString res = getInfo(lst[i],rev,peg,recursive,true); if (!res.isEmpty()) { text+="

"+lst[i]+"

"; text+=res; @@ -843,7 +843,7 @@ void SvnActions::makeInfo(const QStringList&lst,const svn::Revision&rev,const sv } text = ""+text+""; KTextBrowser*ptr; - KDialogBase*dlg = createDialog(&ptr,QString(i18n("Infolist")),false,"info_dialog"); + KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Infolist")),false,"info_dialog"); if (dlg) { ptr->setText(text); dlg->exec(); @@ -858,33 +858,33 @@ void SvnActions::makeInfo(const QStringList&lst,const svn::Revision&rev,const sv */ void SvnActions::slotProperties() { - /// @todo remove reference to parentlist + /// @todo remove reference to tqparentlist if (!m_Data->m_CurrentContext) return; if (!m_Data->m_ParentList) return; SvnItem*k = m_Data->m_ParentList->Selected(); if (!k) return; PropertiesDlg dlg(k,svnclient(), m_Data->m_ParentList->isWorkingCopy()?svn::Revision::WORKING:svn::Revision::HEAD); - connect(&dlg,SIGNAL(clientException(const QString&)),m_Data->m_ParentList->realWidget(),SLOT(slotClientException(const QString&))); + connect(&dlg,TQT_SIGNAL(clientException(const TQString&)),m_Data->m_ParentList->realWidget(),TQT_SLOT(slotClientException(const TQString&))); dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()), "properties_dlg")); - if (dlg.exec()!=QDialog::Accepted) { + if (dlg.exec()!=TQDialog::Accepted) { return; } dlg.saveDialogSize(*(Kdesvnsettings::self()->config()),"properties_dlg",false); - QString ex; + TQString ex; svn::PropertiesMap setList; - QValueList delList; + TQValueList delList; dlg.changedItems(setList,delList); changeProperties(setList,delList,k->fullName()); - k->refreshStatus(); + k->refreshtqStatus(); EMIT_FINISHED; } -bool SvnActions::changeProperties(const svn::PropertiesMap&setList,const QValueList&delList,const QString&path) +bool SvnActions::changeProperties(const svn::PropertiesMap&setList,const TQValueList&delList,const TQString&path) { try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Applying properties","
Applying
hit cancel for abort
"); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); unsigned int pos; for (pos = 0; posm_Svnclient->propdel(delList[pos],svn::Path(path)); @@ -908,10 +908,10 @@ void SvnActions::slotCommit() if (!m_Data->m_CurrentContext||!m_Data->m_ParentList->isWorkingCopy()) { return; } - QPtrList which; + TQPtrList which; m_Data->m_ParentList->SelectionList(&which); SvnItem*cur; - QPtrListIterator liter(which); + TQPtrListIterator liter(which); svn::Pathes targets; if (which.count()==0) { @@ -940,7 +940,7 @@ bool SvnActions::makeCommit(const svn::Targets&targets) svn::Targets _targets; svn::Pathes _deldir; bool review = Kdesvnsettings::review_commit(); - QString msg,_p; + TQString msg,_p; if (!doNetworking()) { emit clientException(i18n("Not commiting because networking is disabled")); @@ -963,7 +963,7 @@ bool SvnActions::makeCommit(const svn::Targets&targets) for (unsigned j = 0; j < targets.size(); ++j) { svn::Revision where = svn::Revision::HEAD; try { - StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Status / List"),i18n("Creating list / check status")); + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("tqStatus / List"),i18n("Creating list / check status")); _Cache = m_Data->m_Svnclient->status(targets.target(j).path(),svn::DepthInfinity,false,false,false,where); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -972,18 +972,18 @@ bool SvnActions::makeCommit(const svn::Targets&targets) for (unsigned int i = 0; i < _Cache.count();++i) { _p = _Cache[i]->path(); if (_Cache[i]->isRealVersioned()&& ( - _Cache[i]->textStatus()==svn_wc_status_modified|| - _Cache[i]->textStatus()==svn_wc_status_added|| - _Cache[i]->textStatus()==svn_wc_status_replaced|| - _Cache[i]->textStatus()==svn_wc_status_deleted|| - _Cache[i]->propStatus()==svn_wc_status_modified + _Cache[i]->texttqStatus()==svn_wc_status_modified|| + _Cache[i]->texttqStatus()==svn_wc_status_added|| + _Cache[i]->texttqStatus()==svn_wc_status_replaced|| + _Cache[i]->texttqStatus()==svn_wc_status_deleted|| + _Cache[i]->proptqStatus()==svn_wc_status_modified ) ) { - if (_Cache[i]->textStatus()==svn_wc_status_deleted) { + if (_Cache[i]->texttqStatus()==svn_wc_status_deleted) { _check.append(Logmsg_impl::logActionEntry(_p,i18n("Delete"),Logmsg_impl::logActionEntry::DELETE)); } else { _check.append(Logmsg_impl::logActionEntry(_p,i18n("Commit"),Logmsg_impl::logActionEntry::COMMIT)); } - } else if (_Cache[i]->textStatus()==svn_wc_status_missing) { + } else if (_Cache[i]->texttqStatus()==svn_wc_status_missing) { _uncheck.append(Logmsg_impl::logActionEntry(_p,i18n("Delete and Commit"),Logmsg_impl::logActionEntry::MISSING_DELETE)); } else if (!_Cache[i]->isVersioned()) { _uncheck.append(Logmsg_impl::logActionEntry(_p,i18n("Add and Commit"),Logmsg_impl::logActionEntry::ADD_COMMIT)); @@ -998,7 +998,7 @@ bool SvnActions::makeCommit(const svn::Targets&targets) svn::Pathes _add,_commit,_delete; for (unsigned int i=0; i < _result.count();++i) { if (_result[i]._kind==Logmsg_impl::logActionEntry::DELETE) { - QFileInfo fi(_result[i]._name); + TQFileInfo fi(_result[i]._name); if (fi.isDir()) { depth = svn::DepthInfinity; } @@ -1024,14 +1024,14 @@ bool SvnActions::makeCommit(const svn::Targets&targets) try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Commiting"), i18n("Commiting - hit cancel for abort")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); nnum = m_Data->m_Svnclient->commit(_targets,msg,depth,keeplocks); } catch (const svn::Exception&e) { emit clientException(e.msg()); return false; } EMIT_REFRESH; - emit sendNotify(i18n("Committed revision %1.").arg(nnum.toString())); + emit sendNotify(i18n("Committed revision %1.").tqarg(nnum.toString())); return true; } @@ -1050,23 +1050,23 @@ void SvnActions::receivedStderr(KProcess*proc,char*buff,int len) if (!proc || !buff || len == 0) { return; } - QString msg(QCString(buff,len)); + TQString msg(TQCString(buff,len)); emit sendNotify(msg); } void SvnActions::procClosed(KProcess*proc) { if (!proc) return; - QMap::iterator it; - if ( (it=m_Data->m_tempfilelist.find(proc))!=m_Data->m_tempfilelist.end()) { - for (QStringList::iterator it2 = (*it).begin(); + TQMap::iterator it; + if ( (it=m_Data->m_tempfilelist.tqfind(proc))!=m_Data->m_tempfilelist.end()) { + for (TQStringList::iterator it2 = (*it).begin(); it2 != (*it).end();++it2) { ::unlink((*it2).ascii()); } m_Data->m_tempfilelist.erase(it); } - if ( (it=m_Data->m_tempdirlist.find(proc))!=m_Data->m_tempdirlist.end()) { - for (QStringList::iterator it2 = (*it).begin(); + if ( (it=m_Data->m_tempdirlist.tqfind(proc))!=m_Data->m_tempdirlist.end()) { + for (TQStringList::iterator it2 = (*it).begin(); it2 != (*it).end();++it2) { KIO::NetAccess::del((*it2),0); } @@ -1075,7 +1075,7 @@ void SvnActions::procClosed(KProcess*proc) delete proc; } -bool SvnActions::get(const QString&what,const QString& to,const svn::Revision&rev,const svn::Revision&peg,QWidget*p) +bool SvnActions::get(const TQString&what,const TQString& to,const svn::Revision&rev,const svn::Revision&peg,TQWidget*p) { svn::Revision _peg = peg; if (_peg == svn::Revision::UNDEFINED) { @@ -1085,7 +1085,7 @@ bool SvnActions::get(const QString&what,const QString& to,const svn::Revision&re try { StopDlg sdlg(m_Data->m_SvnContextListener,p?p:m_Data->m_ParentList->realWidget(),0,"Downloading", i18n("Download - hit cancel for abort")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->get(svn::Path(what), to,rev,_peg); } catch (const svn::Exception&e) { @@ -1096,19 +1096,19 @@ bool SvnActions::get(const QString&what,const QString& to,const svn::Revision&re } /*! - \fn SvnActions::makeDiff(const QString&,const svn::Revision&start,const svn::Revision&end) + \fn SvnActions::makeDiff(const TQString&,const svn::Revision&start,const svn::Revision&end) */ -void SvnActions::makeDiff(const QString&what,const svn::Revision&start,const svn::Revision&end,const svn::Revision&_peg,bool isDir) +void SvnActions::makeDiff(const TQString&what,const svn::Revision&start,const svn::Revision&end,const svn::Revision&_peg,bool isDir) { makeDiff(what,start,what,end,_peg,isDir,m_Data->m_ParentList->realWidget()); } -void SvnActions::makeDiff(const QString&p1,const svn::Revision&start,const QString&p2,const svn::Revision&end) +void SvnActions::makeDiff(const TQString&p1,const svn::Revision&start,const TQString&p2,const svn::Revision&end) { - makeDiff(p1,start,p2,end,(QWidget*)0); + makeDiff(p1,start,p2,end,(TQWidget*)0); } -void SvnActions::makeDiff(const QString&p1,const svn::Revision&start,const QString&p2,const svn::Revision&end,QWidget*p) +void SvnActions::makeDiff(const TQString&p1,const svn::Revision&start,const TQString&p2,const svn::Revision&end,TQWidget*p) { if (!doNetworking()&&start!=svn::Revision::BASE && end!=svn::Revision::WORKING) { emit sendNotify(i18n("Can not do this diff because networking is disabled.")); @@ -1126,21 +1126,21 @@ void SvnActions::makeDiff(const QString&p1,const svn::Revision&start,const QStri makeDiffinternal(p1,start,p2,end,p); } -void SvnActions::makeDiffExternal(const QString&p1,const svn::Revision&start,const QString&p2,const svn::Revision&end,const svn::Revision&_peg, - bool isDir,QWidget*p,bool rec) +void SvnActions::makeDiffExternal(const TQString&p1,const svn::Revision&start,const TQString&p2,const svn::Revision&end,const svn::Revision&_peg, + bool isDir,TQWidget*p,bool rec) { - QString edisp = Kdesvnsettings::external_diff_display(); - QStringList wlist = QStringList::split(" ",edisp); - QFileInfo f1(p1); - QFileInfo f2(p2); - KTempFile tfile(QString::null,f1.fileName()+"-"+start.toString()),tfile2(QString::null,f2.fileName()+"-"+end.toString()); - QString s1 = f1.fileName()+"-"+start.toString(); - QString s2 = f2.fileName()+"-"+end.toString(); + TQString edisp = Kdesvnsettings::external_diff_display(); + TQStringList wlist = TQStringList::split(" ",edisp); + TQFileInfo f1(p1); + TQFileInfo f2(p2); + KTempFile tfile(TQString(),f1.fileName()+"-"+start.toString()),tfile2(TQString(),f2.fileName()+"-"+end.toString()); + TQString s1 = f1.fileName()+"-"+start.toString(); + TQString s2 = f2.fileName()+"-"+end.toString(); KTempDir tdir1; tdir1.setAutoDelete(true); tfile.setAutoDelete(true); tfile2.setAutoDelete(true); - QString first,second; + TQString first,second; svn::Revision peg = _peg; if (start != svn::Revision::WORKING) { @@ -1184,7 +1184,7 @@ void SvnActions::makeDiffExternal(const QString&p1,const svn::Revision&start,con } } KProcess*proc = new KProcess(); - for ( QStringList::Iterator it = wlist.begin();it!=wlist.end();++it) { + for ( TQStringList::Iterator it = wlist.begin();it!=wlist.end();++it) { if (*it=="%1") { *proc<start(m_Data->runblocked?KProcess::Block:KProcess::NotifyOnExit,KProcess::All)) { if (!m_Data->runblocked) { if (!isDir) { @@ -1216,7 +1216,7 @@ void SvnActions::makeDiffExternal(const QString&p1,const svn::Revision&start,con return; } -void SvnActions::makeDiff(const QString&p1,const svn::Revision&start,const QString&p2,const svn::Revision&end,const svn::Revision&_peg,bool isDir,QWidget*p) +void SvnActions::makeDiff(const TQString&p1,const svn::Revision&start,const TQString&p2,const svn::Revision&end,const svn::Revision&_peg,bool isDir,TQWidget*p) { if (m_Data->isExternalDiff()) { kdDebug()<<"External diff 2..."<m_CurrentContext) return; - QByteArray ex; + TQByteArray ex; KTempDir tdir; tdir.setAutoDelete(true); - QString tn = QString("%1/%2").arg(tdir.name()).arg("/svndiff"); + TQString tn = TQString("%1/%2").tqarg(tdir.name()).tqarg("/svndiff"); bool ignore_content = Kdesvnsettings::diff_ignore_content(); - QWidget*parent = p?p:m_Data->m_ParentList->realWidget(); - QStringList extraOptions; + TQWidget*tqparent = p?p:m_Data->m_ParentList->realWidget(); + TQStringList extraOptions; if (Kdesvnsettings::diff_ignore_spaces()) { extraOptions.append("-b"); @@ -1247,9 +1247,9 @@ void SvnActions::makeDiffinternal(const QString&p1,const svn::Revision&r1,const svn::Revision peg = _peg==svn::Revision::UNDEFINED?r2:_peg; try { - StopDlg sdlg(m_Data->m_SvnContextListener,parent,0,"Diffing", + StopDlg sdlg(m_Data->m_SvnContextListener,tqparent,0,"Diffing", i18n("Diffing - hit cancel for abort")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); if (p1==p2 && (r1.isRemote()||r2.isRemote())) { kdDebug()<<"Pegged diff"<m_Svnclient->diff_peg(svn::Path(tn), @@ -1273,7 +1273,7 @@ void SvnActions::makeDiffinternal(const QString&p1,const svn::Revision&r1,const dispDiff(ex); } -void SvnActions::makeNorecDiff(const QString&p1,const svn::Revision&r1,const QString&p2,const svn::Revision&r2,QWidget*_p) +void SvnActions::makeNorecDiff(const TQString&p1,const svn::Revision&r1,const TQString&p2,const svn::Revision&r2,TQWidget*_p) { if (!m_Data->m_CurrentContext) return; if (m_Data->isExternalDiff()) { @@ -1283,7 +1283,7 @@ void SvnActions::makeNorecDiff(const QString&p1,const svn::Revision&r1,const QSt } return; } - QStringList extraOptions; + TQStringList extraOptions; if (Kdesvnsettings::diff_ignore_spaces()) { extraOptions.append("-b"); @@ -1292,15 +1292,15 @@ void SvnActions::makeNorecDiff(const QString&p1,const svn::Revision&r1,const QSt { extraOptions.append("-w"); } - QByteArray ex; + TQByteArray ex; KTempDir tdir; tdir.setAutoDelete(true); kdDebug()<<"Non recourse diff"<m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),0,"Diffing","Diffing - hit cancel for abort"); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); ex = m_Data->m_Svnclient->diff(svn::Path(tn), svn::Path(p1),svn::Path(p2),svn::Path(), r1, r2, @@ -1318,22 +1318,22 @@ void SvnActions::makeNorecDiff(const QString&p1,const svn::Revision&r1,const QSt dispDiff(ex); } -void SvnActions::dispDiff(const QByteArray&ex) +void SvnActions::dispDiff(const TQByteArray&ex) { - QString what = Kdesvnsettings::external_diff_display(); + TQString what = Kdesvnsettings::external_diff_display(); int r = KProcess::Stdin|KProcess::Stderr; - if (Kdesvnsettings::use_external_diff() && (what.find("%1")==-1 || what.find("%2")==-1)) { - QStringList wlist = QStringList::split(" ",what); + if (Kdesvnsettings::use_external_diff() && (what.tqfind("%1")==-1 || what.tqfind("%2")==-1)) { + TQStringList wlist = TQStringList::split(" ",what); KProcess*proc = new KProcess(); bool fname_used = false; KTempFile tfile; tfile.setAutoDelete(false); - for ( QStringList::Iterator it = wlist.begin();it!=wlist.end();++it) { + for ( TQStringList::Iterator it = wlist.begin();it!=wlist.end();++it) { if (*it=="%f") { fname_used = true; - QDataStream*ds = tfile.dataStream(); + TQDataStream*ds = tfile.dataStream(); ds->writeRawBytes(ex,ex.size()); tfile.close(); *proc<start(KProcess::NotifyOnExit,fname_used?KProcess::Stderr:(KProcess::Communication)r)) { if (!fname_used) proc->writeStdin(ex,ex.size()); @@ -1356,24 +1356,24 @@ void SvnActions::dispDiff(const QByteArray&ex) } delete proc; } - bool need_modal = m_Data->runblocked||KApplication::activeModalWidget()!=0; + bool need_modal = m_Data->runblocked||TQT_TQWIDGET(KApplication::activeModalWidget())!=0; if (need_modal||!m_Data->m_DiffBrowserPtr||!m_Data->m_DiffDialog) { DiffBrowser*ptr; if (!need_modal && m_Data->m_DiffBrowserPtr) { delete m_Data->m_DiffBrowserPtr; } - KDialogBase*dlg = createDialog(&ptr,QString(i18n("Diff display")),false, + KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Diff display")),false, "diff_display",false,need_modal, KStdGuiItem::saveAs()); if (dlg) { - QWidget*wd = dlg->mainWidget(); + TQWidget*wd = dlg->mainWidget(); if (wd) { EncodingSelector_impl * ls = new EncodingSelector_impl("",wd); - QObject::connect(ls,SIGNAL(TextCodecChanged(const QString&)), - ptr,SLOT(slotTextCodecChanged(const QString&))); + TQObject::connect(ls,TQT_SIGNAL(TextCodecChanged(const TQString&)), + ptr,TQT_SLOT(slotTextCodecChanged(const TQString&))); } - QObject::connect(dlg,SIGNAL(user1Clicked()),ptr,SLOT(saveDiff())); + TQObject::connect(dlg,TQT_SIGNAL(user1Clicked()),ptr,TQT_SLOT(saveDiff())); ptr->setText(ex); if (need_modal) { ptr->setFocus(); @@ -1398,18 +1398,18 @@ void SvnActions::dispDiff(const QByteArray&ex) /*! - \fn SvnActions::makeUpdate(const QString&what,const svn::Revision&rev,bool recurse) + \fn SvnActions::makeUpdate(const TQString&what,const svn::Revision&rev,bool recurse) */ -void SvnActions::makeUpdate(const QStringList&what,const svn::Revision&rev,bool recurse) +void SvnActions::makeUpdate(const TQStringList&what,const svn::Revision&rev,bool recurse) { if (!m_Data->m_CurrentContext) return; - QString ex; + TQString ex; svn::Revisions ret; stopCheckUpdateThread(); try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Making update", i18n("Making update - hit cancel for abort")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); svn::Targets pathes(what); ret = m_Data->m_Svnclient->update(pathes,rev, recurse?svn::DepthInfinity:svn::DepthFiles,false,false,true); } catch (const svn::Exception&e) { @@ -1439,7 +1439,7 @@ void SvnActions::prepareUpdate(bool ask) SvnItemList k; m_Data->m_ParentList->SelectionList(&k); - QStringList what; + TQStringList what; if (k.count()==0) { what.append(m_Data->m_ParentList->baseUri()); } else { @@ -1453,20 +1453,20 @@ void SvnActions::prepareUpdate(bool ask) svn::Revision r(svn::Revision::HEAD); if (ask) { Rangeinput_impl*rdlg; - KDialog*dlg = createDialog(&rdlg,QString(i18n("Revisions")),true); + KDialog*dlg = createDialog(&rdlg,TQString(i18n("Revisions")),true); if (!dlg) { return; } rdlg->setStartOnly(true); - /* just here cause layout has changed meanwhile */ - dlg->resize( QSize(120,60).expandedTo(dlg->minimumSizeHint()) ); + /* just here cause tqlayout has changed meanwhile */ + dlg->resize( TQSize(120,60).expandedTo(dlg->tqminimumSizeHint()) ); int result; - if ((result=dlg->exec())==QDialog::Accepted) { + if ((result=dlg->exec())==TQDialog::Accepted) { Rangeinput_impl::revision_range range = rdlg->getRange(); r=range.first; } delete dlg; - if (result!=QDialog::Accepted) return; + if (result!=TQDialog::Accepted) return; } makeUpdate(what,r,true); } @@ -1498,20 +1498,20 @@ void SvnActions::makeAdd(bool rec) { if (!m_Data->m_CurrentContext) return; if (!m_Data->m_ParentList) return; - QPtrList lst; + TQPtrList lst; m_Data->m_ParentList->SelectionList(&lst); if (lst.count()==0) { KMessageBox::error(m_Data->m_ParentList->realWidget(),i18n("Which files or directories should I add?")); return; } - QValueList items; + TQValueList items; SvnItemListIterator liter(lst); SvnItem*cur; while ((cur=liter.current())!=0){ ++liter; if (cur->isVersioned()) { KMessageBox::error(m_Data->m_ParentList->realWidget(),i18n("
The entry
%1
is versioned - break.
") - .arg(cur->fullName())); + .tqarg(cur->fullName())); return; } items.push_back(svn::Path(cur->fullName())); @@ -1521,29 +1521,29 @@ void SvnActions::makeAdd(bool rec) #if 0 while ((cur=liter.current())!=0){ ++liter; - //cur->refreshStatus(); + //cur->refreshtqStatus(); - //emit sigRefreshCurrent(static_cast(cur->parent())); + //emit sigRefreshCurrent(static_cast(cur->tqparent())); } #else emit sigRefreshCurrent(0); #endif } -bool SvnActions::addItems(const QStringList&w,svn::Depth depth) +bool SvnActions::addItems(const TQStringList&w,svn::Depth depth) { - QValueList items; + TQValueList items; for (unsigned int i = 0; i &items,svn::Depth depth) +bool SvnActions::addItems(const TQValueList &items,svn::Depth depth) { - QString ex; + TQString ex; try { - QValueList::const_iterator piter; + TQValueList::const_iterator piter; for (piter=items.begin();piter!=items.end();++piter) { m_Data->m_Svnclient->add((*piter),depth); } @@ -1554,7 +1554,7 @@ bool SvnActions::addItems(const QValueList &items,svn::Depth depth) return true; } -bool SvnActions::makeDelete(const QStringList&w) +bool SvnActions::makeDelete(const TQStringList&w) { int answer = KMessageBox::questionYesNoList(0,i18n("Really delete these entries?"),w,i18n("Delete from repository")); if (answer!=KMessageBox::Yes) { @@ -1573,7 +1573,7 @@ bool SvnActions::makeDelete(const QStringList&w) bool SvnActions::makeDelete(const svn::Pathes&items) { if (!m_Data->m_CurrentContext) return false; - QString ex; + TQString ex; try { svn::Targets target(items); m_Data->m_Svnclient->remove(target,false); @@ -1610,7 +1610,7 @@ void SvnActions::CheckoutExport(bool _exp) CheckoutInfo_impl*ptr; KDialogBase * dlg = createDialog(&ptr,(_exp?i18n("Export repository"):i18n("Checkout a repository")),true,"checkout_export_dialog"); if (dlg) { - if (dlg->exec()==QDialog::Accepted) { + if (dlg->exec()==TQDialog::Accepted) { svn::Revision r = ptr->toRevision(); bool openit = ptr->openAfterJob(); bool ignoreExternal=ptr->ignoreExternals(); @@ -1626,7 +1626,7 @@ void SvnActions::CheckoutExport(bool _exp) } } -void SvnActions::CheckoutExport(const QString&what,bool _exp,bool urlisTarget) +void SvnActions::CheckoutExport(const TQString&what,bool _exp,bool urlisTarget) { CheckoutInfo_impl*ptr; KDialog * dlg = createDialog(&ptr,_exp?i18n("Export a repository"):i18n("Checkout a repository"),true); @@ -1636,7 +1636,7 @@ void SvnActions::CheckoutExport(const QString&what,bool _exp,bool urlisTarget) } else { ptr->setTargetUrl(what); } - if (dlg->exec()==QDialog::Accepted) { + if (dlg->exec()==TQDialog::Accepted) { svn::Revision r = ptr->toRevision(); bool openIt = ptr->openAfterJob(); bool ignoreExternal = ptr->ignoreExternals(); @@ -1654,7 +1654,7 @@ void SvnActions::CheckoutExportCurrent(bool _exp) KMessageBox::error(m_Data->m_ParentList->realWidget(),_exp?i18n("Exporting a file?"):i18n("Checking out a file?")); return; } - QString what; + TQString what; if (!k) { what = m_Data->m_ParentList->baseUri(); } else { @@ -1663,7 +1663,7 @@ void SvnActions::CheckoutExportCurrent(bool _exp) CheckoutExport(what,_exp); } -bool SvnActions::makeCheckout(const QString&rUrl,const QString&tPath,const svn::Revision&r,const svn::Revision&_peg, +bool SvnActions::makeCheckout(const TQString&rUrl,const TQString&tPath,const svn::Revision&r,const svn::Revision&_peg, svn::Depth depth, // kind of operation bool _exp, @@ -1673,11 +1673,11 @@ bool SvnActions::makeCheckout(const QString&rUrl,const QString&tPath,const svn:: bool ignoreExternal, // overwrite/force not versioned items bool overwrite, - QWidget*_p + TQWidget*_p ) { - QString fUrl = rUrl; - QString ex; + TQString fUrl = rUrl; + TQString ex; while (fUrl.endsWith("/")) { fUrl.truncate(fUrl.length()-1); } @@ -1689,10 +1689,10 @@ bool SvnActions::makeCheckout(const QString&rUrl,const QString&tPath,const svn:: if (!_exp||!m_Data->m_CurrentContext) reInitClient(); try { StopDlg sdlg(m_Data->m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),0,_exp?i18n("Export"):i18n("Checkout"),_exp?i18n("Exporting"):i18n("Checking out")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); if (_exp) { /// @todo setup parameter for export operation - m_Data->m_Svnclient->doExport(svn::Path(fUrl),p,r,peg,overwrite,QString::null,ignoreExternal,depth); + m_Data->m_Svnclient->doExport(svn::Path(fUrl),p,r,peg,overwrite,TQString(),ignoreExternal,depth); } else { m_Data->m_Svnclient->checkout(fUrl,p,r,peg,depth,ignoreExternal,overwrite); } @@ -1712,16 +1712,16 @@ bool SvnActions::makeCheckout(const QString&rUrl,const QString&tPath,const svn:: void SvnActions::slotRevert() { if (!m_Data->m_ParentList||!m_Data->m_ParentList->isWorkingCopy()) return; - QPtrList lst; + TQPtrList lst; m_Data->m_ParentList->SelectionList(&lst); - QStringList displist; + TQStringList displist; SvnItemListIterator liter(lst); SvnItem*cur; if (lst.count()>0) { while ((cur=liter.current())!=0){ if (!cur->isVersioned()) { KMessageBox::error(m_Data->m_ParentList->realWidget(),i18n("
The entry
%1
is not versioned - break.
") - .arg(cur->fullName())); + .tqarg(cur->fullName())); return; } displist.append(cur->fullName()); @@ -1734,7 +1734,7 @@ void SvnActions::slotRevert() EMIT_REFRESH; } -void SvnActions::slotRevertItems(const QStringList&displist) +void SvnActions::slotRevertItems(const TQStringList&displist) { if (!m_Data->m_CurrentContext) return; if (displist.count()==0) { @@ -1748,21 +1748,21 @@ void SvnActions::slotRevertItems(const QStringList&displist) return; } ptr->setDispList(displist); - if (dlg->exec()!=QDialog::Accepted) { + if (dlg->exec()!=TQDialog::Accepted) { delete dlg; return; } depth = ptr->getDepth(); - QValueList items; + TQValueList items; for (unsigned j = 0; jm_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Revert"),i18n("Reverting items")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); svn::Targets target(items); m_Data->m_Svnclient->revert(target,depth); } catch (const svn::Exception&e) { @@ -1777,18 +1777,18 @@ void SvnActions::slotRevertItems(const QStringList&displist) EMIT_FINISHED; } -bool SvnActions::makeSwitch(const QString&rUrl,const QString&tPath,const svn::Revision&r,svn::Depth depth,const svn::Revision&peg,bool stickydepth,bool ignore_externals,bool allow_unversioned) +bool SvnActions::makeSwitch(const TQString&rUrl,const TQString&tPath,const svn::Revision&r,svn::Depth depth,const svn::Revision&peg,bool stickydepth,bool ignore_externals,bool allow_unversioned) { if (!m_Data->m_CurrentContext) return false; - QString fUrl = rUrl; - QString ex; + TQString fUrl = rUrl; + TQString ex; while (fUrl.endsWith("/")) { fUrl.truncate(fUrl.length()-1); } svn::Path p(tPath); try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Switch url"),i18n("Switching url")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->doSwitch(p,fUrl,r,depth,peg,stickydepth,ignore_externals,allow_unversioned); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -1798,12 +1798,12 @@ bool SvnActions::makeSwitch(const QString&rUrl,const QString&tPath,const svn::Re return true; } -bool SvnActions::makeRelocate(const QString&fUrl,const QString&tUrl,const QString&path,bool rec) +bool SvnActions::makeRelocate(const TQString&fUrl,const TQString&tUrl,const TQString&path,bool rec) { if (!m_Data->m_CurrentContext) return false; - QString _f = fUrl; - QString _t = tUrl; - QString ex; + TQString _f = fUrl; + TQString _t = tUrl; + TQString ex; while (_f.endsWith("/")) { _f.truncate(_f.length()-1); } @@ -1813,7 +1813,7 @@ bool SvnActions::makeRelocate(const QString&fUrl,const QString&tUrl,const QStrin svn::Path p(path); try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Relocate url"),i18n("Relocate repository to new URL")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->relocate(p,_f,_t,rec); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -1828,7 +1828,7 @@ void SvnActions::slotSwitch() if (!m_Data->m_CurrentContext) return; if (!m_Data->m_ParentList||!m_Data->m_ParentList->isWorkingCopy()) return; - QPtrList lst; + TQPtrList lst; m_Data->m_ParentList->SelectionList(&lst); if (lst.count()>1) { @@ -1842,7 +1842,7 @@ void SvnActions::slotSwitch() KMessageBox::error(0,i18n("Error getting entry to switch")); return; } - QString path,what; + TQString path,what; path = k->fullName(); what = k->Url(); if (makeSwitch(path,what)) { @@ -1850,7 +1850,7 @@ void SvnActions::slotSwitch() } } -bool SvnActions::makeSwitch(const QString&path,const QString&what) +bool SvnActions::makeSwitch(const TQString&path,const TQString&what) { CheckoutInfo_impl*ptr; KDialogBase * dlg = createDialog(&ptr,i18n("Switch url"),true,"switch_url_dlg"); @@ -1860,7 +1860,7 @@ bool SvnActions::makeSwitch(const QString&path,const QString&what) ptr->disableAppend(true); ptr->disableTargetDir(true); ptr->disableOpen(true); - if (dlg->exec()==QDialog::Accepted) { + if (dlg->exec()==TQDialog::Accepted) { svn::Revision r = ptr->toRevision(); done = makeSwitch(ptr->reposURL(),path,r,ptr->getDepth(),r,true,ptr->ignoreExternals(),ptr->overwrite()); } @@ -1870,12 +1870,12 @@ bool SvnActions::makeSwitch(const QString&path,const QString&what) return done; } -bool SvnActions::makeCleanup(const QString&path) +bool SvnActions::makeCleanup(const TQString&path) { if (!m_Data->m_CurrentContext) return false; try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Cleanup"),i18n("Cleaning up folder")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->cleanup(svn::Path(path)); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -1884,12 +1884,12 @@ bool SvnActions::makeCleanup(const QString&path) return true; } -void SvnActions::slotResolved(const QString&path) +void SvnActions::slotResolved(const TQString&path) { if (!m_Data->m_CurrentContext) return; try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Resolve"),i18n("Marking resolved")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->resolve(svn::Path(path),svn::DepthEmpty); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -1898,11 +1898,11 @@ void SvnActions::slotResolved(const QString&path) m_Data->m_conflictCache.deleteKey(path,false); } -void SvnActions::slotResolve(const QString&p) +void SvnActions::slotResolve(const TQString&p) { if (!m_Data->m_CurrentContext) return; - QString eresolv = Kdesvnsettings::conflict_resolver(); - QStringList wlist = QStringList::split(" ",eresolv); + TQString eresolv = Kdesvnsettings::conflict_resolver(); + TQStringList wlist = TQStringList::split(" ",eresolv); if (wlist.size()==0) { return; } @@ -1911,8 +1911,8 @@ void SvnActions::slotResolve(const QString&p) if (!singleInfo(p,svn::Revision::UNDEFINED,i1)) { return; } - QFileInfo fi(p); - QString base = fi.dirPath(true); + TQFileInfo fi(p); + TQString base = fi.dirPath(true); kdDebug()<start(m_Data->runblocked?KProcess::Block:KProcess::NotifyOnExit,KProcess::All)) { return; } else { @@ -1950,13 +1950,13 @@ void SvnActions::slotResolve(const QString&p) return; } -void SvnActions::slotImport(const QString&path,const QString&target,const QString&message,svn::Depth depth, +void SvnActions::slotImport(const TQString&path,const TQString&target,const TQString&message,svn::Depth depth, bool noIgnore,bool noUnknown) { if (!m_Data->m_CurrentContext) return; try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Import"),i18n("Importing items")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->import(svn::Path(path),target,message,depth,noIgnore,noUnknown); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -1964,14 +1964,14 @@ void SvnActions::slotImport(const QString&path,const QString&target,const QStrin } } -void SvnActions::slotMergeExternal(const QString&_src1,const QString&_src2, const QString&_target, +void SvnActions::slotMergeExternal(const TQString&_src1,const TQString&_src2, const TQString&_target, const svn::Revision&rev1,const svn::Revision&rev2,const svn::Revision&_peg,bool rec) { KTempDir tdir1; tdir1.setAutoDelete(true); - QString src1 = _src1; - QString src2 = _src2; - QString target = _target; + TQString src1 = _src1; + TQString src2 = _src2; + TQString target = _target; bool singleMerge = false; if (rev1 == rev2 && (src2.isEmpty() || src1==src2) ) { @@ -1992,8 +1992,8 @@ void SvnActions::slotMergeExternal(const QString&_src1,const QString&_src2, cons return; } - QFileInfo f1(src1); - QFileInfo f2(src2); + TQFileInfo f1(src1); + TQFileInfo f2(src2); bool isDir = true; svn::InfoEntry i1,i2; @@ -2012,16 +2012,16 @@ void SvnActions::slotMergeExternal(const QString&_src1,const QString&_src2, cons } } - QFileInfo ti(target); + TQFileInfo ti(target); if (ti.isDir()!=isDir) { emit clientException(i18n("Target for merge must same type like sources!")); return; } - QString s1 = f1.fileName()+"-"+rev1.toString(); - QString s2 = f2.fileName()+"-"+rev2.toString(); - QString first,second,out; + TQString s1 = f1.fileName()+"-"+rev1.toString(); + TQString s2 = f2.fileName()+"-"+rev2.toString(); + TQString first,second,out; if (rev1 != svn::Revision::WORKING) { first = tdir1.name()+"/"+s1; } else { @@ -2035,7 +2035,7 @@ void SvnActions::slotMergeExternal(const QString&_src1,const QString&_src2, cons } } else { // only two-way merge - second = QString::null; + second = TQString(); } if (second == first) { KMessageBox::error(m_Data->m_ParentList->realWidget(),i18n("Both entries seems to be the same, won't do a merge.")); @@ -2074,10 +2074,10 @@ void SvnActions::slotMergeExternal(const QString&_src1,const QString&_src2, cons } } } - QString edisp = Kdesvnsettings::external_merge_program(); - QStringList wlist = QStringList::split(" ",edisp); + TQString edisp = Kdesvnsettings::external_merge_program(); + TQStringList wlist = TQStringList::split(" ",edisp); KProcess*proc = new KProcess(); - for ( QStringList::Iterator it = wlist.begin();it!=wlist.end();++it) { + for ( TQStringList::Iterator it = wlist.begin();it!=wlist.end();++it) { if (*it=="%s1") { *proc<start(m_Data->runblocked?KProcess::Block:KProcess::NotifyOnExit,KProcess::Stderr)) { if (!m_Data->runblocked) { tdir1.setAutoDelete(false); @@ -2102,19 +2102,19 @@ void SvnActions::slotMergeExternal(const QString&_src1,const QString&_src2, cons delete proc; } -void SvnActions::slotMergeWcRevisions(const QString&_entry,const svn::Revision&rev1, +void SvnActions::slotMergeWcRevisions(const TQString&_entry,const svn::Revision&rev1, const svn::Revision&rev2, bool rec,bool ancestry,bool forceIt,bool dry) { slotMerge(_entry,_entry,_entry,rev1,rev2,svn::Revision::UNDEFINED,rec,ancestry,forceIt,dry); } -void SvnActions::slotMerge(const QString&src1,const QString&src2, const QString&target, +void SvnActions::slotMerge(const TQString&src1,const TQString&src2, const TQString&target, const svn::Revision&rev1,const svn::Revision&rev2,const svn::Revision&_peg, bool rec,bool ancestry,bool forceIt,bool dry) { if (!m_Data->m_CurrentContext) return; - QString s2; + TQString s2; svn::Revision peg = svn::Revision::HEAD; svn::Revision tpeg; @@ -2147,7 +2147,7 @@ void SvnActions::slotMerge(const QString&src1,const QString&src2, const QString& } try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Merge"),i18n("Merging items")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); if (pegged_merge) { m_Data->m_Svnclient->merge_peg(p1,ranges,svn::Revision::HEAD,svn::Path(target),rec?svn::DepthUnknown:svn::DepthFiles, ancestry,dry,forceIt,false); @@ -2163,33 +2163,33 @@ void SvnActions::slotMerge(const QString&src1,const QString&src2, const QString& } /*! - \fn SvnActions::slotCopyMove(bool,const QString&,const QString&) + \fn SvnActions::slotCopyMove(bool,const TQString&,const TQString&) */ -bool SvnActions::makeMove(const QString&Old,const QString&New,bool force) +bool SvnActions::makeMove(const TQString&Old,const TQString&New,bool force) { if (!m_Data->m_CurrentContext) return false; svn::Revision nnum; try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Move"),i18n("Moving/Rename item ")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); nnum = m_Data->m_Svnclient->move(svn::Path(Old),svn::Path(New),force); } catch (const svn::Exception&e) { emit clientException(e.msg()); return false; } if (nnum != svn::Revision::UNDEFINED) { - emit sendNotify(i18n("Committed revision %1.").arg(nnum.toString())); + emit sendNotify(i18n("Committed revision %1.").tqarg(nnum.toString())); } EMIT_REFRESH; return true; } -bool SvnActions::makeMove(const KURL::List&Old,const QString&New,bool force) +bool SvnActions::makeMove(const KURL::List&Old,const TQString&New,bool force) { svn::Revision nnum; try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Move"),i18n("Moving entries")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); KURL::List::ConstIterator it = Old.begin(); bool local = false; @@ -2211,12 +2211,12 @@ bool SvnActions::makeMove(const KURL::List&Old,const QString&New,bool force) return true; } -bool SvnActions::makeCopy(const QString&Old,const QString&New,const svn::Revision&rev) +bool SvnActions::makeCopy(const TQString&Old,const TQString&New,const svn::Revision&rev) { if (!m_Data->m_CurrentContext) return false; try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Copy / Move"),i18n("Copy or Moving entries")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); m_Data->m_Svnclient->copy(svn::Path(Old),rev,svn::Path(New)); } catch (const svn::Exception&e) { emit clientException(e.msg()); @@ -2226,7 +2226,7 @@ bool SvnActions::makeCopy(const QString&Old,const QString&New,const svn::Revisio return true; } -bool SvnActions::makeCopy(const KURL::List&Old,const QString&New,const svn::Revision&rev) +bool SvnActions::makeCopy(const KURL::List&Old,const TQString&New,const svn::Revision&rev) { KURL::List::ConstIterator it = Old.begin(); svn::Pathes p; @@ -2241,7 +2241,7 @@ bool SvnActions::makeCopy(const KURL::List&Old,const QString&New,const svn::Revi try { StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Copy / Move"),i18n("Copy or Moving entries")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); KURL::List::ConstIterator it = Old.begin(); m_Data->m_Svnclient->copy(t,rev,rev,svn::Path(New),true); } catch (const svn::Exception&e) { @@ -2252,11 +2252,11 @@ bool SvnActions::makeCopy(const KURL::List&Old,const QString&New,const svn::Revi } /*! - \fn SvnActions::makeLock(const QStringList&) + \fn SvnActions::makeLock(const TQStringList&) */ -void SvnActions::makeLock(const QStringList&what,const QString&_msg,bool breakit) +void SvnActions::makeLock(const TQStringList&what,const TQString&_msg,bool breakit) { - QValueList targets; + TQValueList targets; for (unsigned int i = 0; i targets; + TQValueList targets; if (!m_Data->m_CurrentContext) return; for (unsigned int i = 0; im_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Status / List"),i18n("Creating list / check status")); - connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&))); + StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("tqStatus / List"),i18n("Creating list / check status")); + connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&))); // rec all up noign dlist = m_Data->m_Svnclient->status(what,_d,all,updates,display_ignores,where,disp_remote_details,false); } catch (const svn::Exception&e) { @@ -2320,13 +2320,13 @@ bool SvnActions::makeStatus(const QString&what, svn::StatusEntries&dlist, svn::R return true; } -void SvnActions::checkAddItems(const QString&path,bool print_error_box) +void SvnActions::checkAddItems(const TQString&path,bool print_error_box) { svn::StatusEntries dlist; svn::StatusEntries rlist; - QStringList displist; + TQStringList displist; svn::Revision where = svn::Revision::HEAD; - if (!makeStatus(path,dlist,where,true,true,false,false)) { + if (!maketqStatus(path,dlist,where,true,true,false,false)) { return; } for (unsigned int i = 0; iaddColumn("Item"); for (unsigned j = 0; jsetOn(true); } - if (dlg->exec()==QDialog::Accepted) { - QListViewItemIterator it(ptr); + if (dlg->exec()==TQDialog::Accepted) { + TQListViewItemIterator it(ptr); displist.clear(); while(it.current()) { - QCheckListItem*t = (QCheckListItem*)it.current(); + TQCheckListItem*t = (TQCheckListItem*)it.current(); if (t->isOn()) { displist.append(t->text()); } @@ -2402,7 +2402,7 @@ void SvnActions::stopFillCache() } delete m_FCThread; m_FCThread = 0; - emit sigCacheStatus(-1,-1); + emit sigCachetqStatus(-1,-1); } } @@ -2423,7 +2423,7 @@ void SvnActions::killallThreads() stopFillCache(); } -bool SvnActions::createModifiedCache(const QString&what) +bool SvnActions::createModifiedCache(const TQString&what) { stopCheckModThread(); m_Data->m_Cache.clear(); @@ -2446,14 +2446,14 @@ void SvnActions::checkModthread() for (unsigned int i = 0; i < m_CThread->getList().count();++i) { svn::StatusPtr ptr = m_CThread->getList()[i]; if (m_CThread->getList()[i]->isRealVersioned()&& ( - m_CThread->getList()[i]->textStatus()==svn_wc_status_modified|| - m_CThread->getList()[i]->textStatus()==svn_wc_status_added|| - m_CThread->getList()[i]->textStatus()==svn_wc_status_deleted|| - m_CThread->getList()[i]->textStatus()==svn_wc_status_replaced|| - m_CThread->getList()[i]->propStatus()==svn_wc_status_modified + m_CThread->getList()[i]->texttqStatus()==svn_wc_status_modified|| + m_CThread->getList()[i]->texttqStatus()==svn_wc_status_added|| + m_CThread->getList()[i]->texttqStatus()==svn_wc_status_deleted|| + m_CThread->getList()[i]->texttqStatus()==svn_wc_status_replaced|| + m_CThread->getList()[i]->proptqStatus()==svn_wc_status_modified ) ) { m_Data->m_Cache.insertKey(ptr,ptr->path()); - } else if (m_CThread->getList()[i]->textStatus()==svn_wc_status_conflicted) { + } else if (m_CThread->getList()[i]->texttqStatus()==svn_wc_status_conflicted) { m_Data->m_conflictCache.insertKey(ptr,ptr->path()); } } @@ -2478,11 +2478,11 @@ void SvnActions::checkUpdateThread() bool newer=false; for (unsigned int i = 0; i < m_UThread->getList().count();++i) { svn::StatusPtr ptr = m_UThread->getList()[i]; - if (ptr->validReposStatus()) { + if (ptr->validRepostqStatus()) { m_Data->m_UpdateCache.insertKey(ptr,ptr->path()); - ptr->textStatus(); - ptr->propStatus(); - if (!(ptr->validLocalStatus())) { + ptr->texttqStatus(); + ptr->proptqStatus(); + if (!(ptr->validLocaltqStatus())) { newer = true; } } @@ -2500,7 +2500,7 @@ void SvnActions::checkUpdateThread() m_UThread = 0; } -void SvnActions::getaddedItems(const QString&path,svn::StatusEntries&target) +void SvnActions::getaddedItems(const TQString&path,svn::StatusEntries&target) { helpers::ValidRemoteOnly vro; m_Data->m_UpdateCache.listsubs_if(path,vro); @@ -2514,7 +2514,7 @@ bool SvnActions::checkUpdatesRunning() void SvnActions::addModifiedCache(const svn::StatusPtr&what) { - if (what->textStatus()==svn_wc_status_conflicted) { + if (what->texttqStatus()==svn_wc_status_conflicted) { m_Data->m_conflictCache.insertKey(what,what->path()); } else { m_Data->m_Cache.insertKey(what,what->path()); @@ -2522,35 +2522,35 @@ void SvnActions::addModifiedCache(const svn::StatusPtr&what) } } -void SvnActions::deleteFromModifiedCache(const QString&what) +void SvnActions::deleteFromModifiedCache(const TQString&what) { m_Data->m_Cache.deleteKey(what,true); m_Data->m_conflictCache.deleteKey(what,true); //m_Data->m_Cache.dump_tree(); } -bool SvnActions::checkModifiedCache(const QString&path) +bool SvnActions::checkModifiedCache(const TQString&path) { return m_Data->m_Cache.find(path); } -bool SvnActions::checkReposLockCache(const QString&path) +bool SvnActions::checkReposLockCache(const TQString&path) { return m_Data->m_repoLockCache.findSingleValid(path,false); } -bool SvnActions::checkReposLockCache(const QString&path,svn::SharedPointer&t) +bool SvnActions::checkReposLockCache(const TQString&path,svn::SharedPointer&t) { - /// @todo create a method where svn::Status* will be a parameter so no copy is needed but just reading content + /// @todo create a method where svn::tqStatus* will be a parameter so no copy is needed but just reading content return m_Data->m_repoLockCache.findSingleValid(path,t); } -bool SvnActions::checkConflictedCache(const QString&path) +bool SvnActions::checkConflictedCache(const TQString&path) { return m_Data->m_conflictCache.find(path); } -void SvnActions::startFillCache(const QString&path) +void SvnActions::startFillCache(const TQString&path) { stopFillCache(); svn::InfoEntry e; @@ -2590,7 +2590,7 @@ bool SvnActions::doNetworking() return !is_url; } -void SvnActions::customEvent(QCustomEvent * e) +void SvnActions::customEvent(TQCustomEvent * e) { if (e->type()==EVENT_LOGCACHE_FINISHED) { emit sendNotify(i18n("Filling log cache in background finished.")); @@ -2599,14 +2599,14 @@ void SvnActions::customEvent(QCustomEvent * e) return; } else if (e&&e->type()==EVENT_LOGCACHE_STATUS && m_FCThread && m_FCThread->running()) { FillCacheStatusEvent*fev=(FillCacheStatusEvent*)e; - emit sigCacheStatus(fev->current(),fev->max()); + emit sigCachetqStatus(fev->current(),fev->max()); } } /*! - \fn SvnActions::createUpdateCache(const QString&what) + \fn SvnActions::createUpdateCache(const TQString&what) */ -bool SvnActions::createUpdateCache(const QString&what) +bool SvnActions::createUpdateCache(const TQString&what) { clearUpdateCache(); m_Data->m_repoLockCache.clear(); @@ -2624,25 +2624,25 @@ bool SvnActions::createUpdateCache(const QString&what) return true; } -bool SvnActions::checkUpdateCache(const QString&path)const +bool SvnActions::checkUpdateCache(const TQString&path)const { return m_Data->m_UpdateCache.find(path); } -void SvnActions::removeFromUpdateCache(const QStringList&what,bool exact_only) +void SvnActions::removeFromUpdateCache(const TQStringList&what,bool exact_only) { for (unsigned int i = 0; i < what.count(); ++i) { m_Data->m_UpdateCache.deleteKey(what[i],exact_only); } } -bool SvnActions::isUpdated(const QString&path)const +bool SvnActions::isUpdated(const TQString&path)const { - svn::SharedPointer d; + svn::SharedPointer d; return m_Data->m_UpdateCache.findSingleValid(path,d); } -bool SvnActions::getUpdated(const QString&path,svn::SharedPointer&d)const +bool SvnActions::getUpdated(const TQString&path,svn::SharedPointer&d)const { return m_Data->m_UpdateCache.findSingleValid(path,d); } @@ -2653,19 +2653,19 @@ void SvnActions::clearUpdateCache() } /*! - \fn SvnActions::makeIgnoreEntry(const QString&which) + \fn SvnActions::makeIgnoreEntry(const TQString&which) */ bool SvnActions::makeIgnoreEntry(SvnItem*which,bool unignore) { if (!which) return false; - QString parentName = which->getParentDir(); - if (parentName.isEmpty()) return false; - QString name = which->shortName(); - QString ex; - svn::Path p(parentName); + TQString tqparentName = which->getParentDir(); + if (tqparentName.isEmpty()) return false; + TQString name = which->shortName(); + TQString ex; + svn::Path p(tqparentName); svn::Revision r(svn_opt_revision_unspecified); - QPair pmp; + TQPair pmp; try { pmp = m_Data->m_Svnclient->propget("svn:ignore",p,r,r); } catch (const svn::Exception&e) { @@ -2673,14 +2673,14 @@ bool SvnActions::makeIgnoreEntry(SvnItem*which,bool unignore) return false; } svn::PathPropertiesMapList pm = pmp.second; - QString data = ""; + TQString data = ""; if (pm.size()>0) { svn::PropertiesMap&mp = pm[0].second; data = mp["svn:ignore"]; } bool result = false; - QStringList lst = QStringList::split("\n",data); - QStringList::iterator it = lst.find(name); + TQStringList lst = TQStringList::split("\n",data); + TQStringList::iterator it = lst.tqfind(name); if (it != lst.end()) { if (unignore) { lst.erase(it); @@ -2704,12 +2704,12 @@ bool SvnActions::makeIgnoreEntry(SvnItem*which,bool unignore) return result; } -svn::PathPropertiesMapListPtr SvnActions::propList(const QString&which,const svn::Revision&where,bool cacheOnly) +svn::PathPropertiesMapListPtr SvnActions::propList(const TQString&which,const svn::Revision&where,bool cacheOnly) { svn::PathPropertiesMapListPtr pm; if (!which.isEmpty()) { - QString fk=where.toString()+"/"+which; - QString ex; + TQString fk=where.toString()+"/"+which; + TQString ex; svn::Path p(which); if (where != svn::Revision::WORKING) @@ -2738,10 +2738,10 @@ svn::PathPropertiesMapListPtr SvnActions::propList(const QString&which,const svn bool SvnActions::isLockNeeded(SvnItem*which,const svn::Revision&where) { if (!which) return false; - QString ex; + TQString ex; svn::Path p(which->fullName()); - QPair pmp; + TQPair pmp; try { pmp = m_Data->m_Svnclient->propget("svn:needs-lock",p,where,where); } catch (const svn::Exception&e) { @@ -2752,30 +2752,30 @@ bool SvnActions::isLockNeeded(SvnItem*which,const svn::Revision&where) svn::PathPropertiesMapList pm = pmp.second; if (pm.size()>0) { svn::PropertiesMap&mp = pm[0].second; - if (mp.find("svn:needs-lock")!=mp.end()) { + if (mp.tqfind("svn:needs-lock")!=mp.end()) { return true; } } return false; } -QString SvnActions::searchProperty(QString&Store, const QString&property, const QString&start,const svn::Revision&where,bool up) +TQString SvnActions::searchProperty(TQString&Store, const TQString&property, const TQString&start,const svn::Revision&where,bool up) { svn::Path pa(start); kdDebug()<<"Url? "<0) { svn::PathPropertiesMapListPtr pm = propList(pa,where,false); if (!pm) { - return QString::null; + return TQString(); } if (pm->size()>0) { svn::PropertiesMap&mp = (*pm)[0].second; - if (mp.find(property)!=mp.end()) { + if (mp.tqfind(property)!=mp.end()) { Store=mp[property]; return pa; } @@ -2792,13 +2792,13 @@ QString SvnActions::searchProperty(QString&Store, const QString&property, const break; } } - return QString::null; + return TQString(); } -bool SvnActions::makeList(const QString&url,svn::DirEntries&dlist,svn::Revision&where,bool rec) +bool SvnActions::makeList(const TQString&url,svn::DirEntries&dlist,svn::Revision&where,bool rec) { if (!m_Data->m_CurrentContext) return false; - QString ex; + TQString ex; try { dlist = m_Data->m_Svnclient->list(url,where,where,rec?svn::DepthInfinity:svn::DepthEmpty,false); } catch (const svn::Exception&e) { @@ -2811,10 +2811,10 @@ bool SvnActions::makeList(const QString&url,svn::DirEntries&dlist,svn::Revision& /*! \fn SvnActions::isLocalWorkingCopy(const KURL&url) */ -bool SvnActions::isLocalWorkingCopy(const KURL&url,QString&_baseUri) +bool SvnActions::isLocalWorkingCopy(const KURL&url,TQString&_baseUri) { if (url.isEmpty()||!url.isLocalFile()) return false; - QString cleanpath = url.path(); + TQString cleanpath = url.path(); while (cleanpath.endsWith("/")) { cleanpath.truncate(cleanpath.length()-1); } @@ -2836,7 +2836,7 @@ bool SvnActions::isLocalWorkingCopy(const KURL&url,QString&_baseUri) return true; } -void SvnActions::slotExtraLogMsg(const QString&msg) +void SvnActions::slotExtraLogMsg(const TQString&msg) { emit sigExtraLogMsg(msg); } @@ -2847,10 +2847,10 @@ void SvnActions::slotCancel(bool how) m_Data->m_SvnContextListener->setCanceled(how); } -void SvnActions::setContextData(const QString&aKey,const QString&aValue) +void SvnActions::setContextData(const TQString&aKey,const TQString&aValue) { if (aValue.isNull()) { - QMap::iterator it = m_Data->m_contextData.find(aKey); + TQMap::iterator it = m_Data->m_contextData.tqfind(aKey); if (it!=m_Data->m_contextData.end()) { m_Data->m_contextData.remove(it); } @@ -2864,12 +2864,12 @@ void SvnActions::clearContextData() m_Data->m_contextData.clear(); } -QString SvnActions::getContextData(const QString&aKey)const +TQString SvnActions::getContextData(const TQString&aKey)const { - if (m_Data->m_contextData.find(aKey)!=m_Data->m_contextData.end()) { + if (m_Data->m_contextData.tqfind(aKey)!=m_Data->m_contextData.end()) { return m_Data->m_contextData[aKey]; } - return QString::null; + return TQString(); } bool SvnActions::threadRunning(ThreadType which) diff --git a/src/svnfrontend/svnactions.h b/src/svnfrontend/svnactions.h index 96a2b5e..783d36a 100644 --- a/src/svnfrontend/svnactions.h +++ b/src/svnfrontend/svnactions.h @@ -31,15 +31,15 @@ #include #include -#include -#include -#include +#include +#include +#include class ItemDisplay; class SvnItem; class KDialog; class KDialogBase; -class QDialog; +class TQDialog; class CContextListener; class KProcess; class SvnActionsData; @@ -60,9 +60,10 @@ namespace KIO { /** @author Rajko Albrecht */ -class SvnActions : public QObject,public SimpleLogCb +class SvnActions : public TQObject,public SimpleLogCb { Q_OBJECT + TQ_OBJECT public: enum ThreadType { checkupdatethread, @@ -70,48 +71,48 @@ public: checkmodifiedthread }; - SvnActions(ItemDisplay *parent, const char *name = 0,bool processes_blocked=false); + SvnActions(ItemDisplay *tqparent, const char *name = 0,bool processes_blocked=false); ~SvnActions(); void reInitClient(); //svn::Client&svnClient(){return m_Svnclient;} svn::Client* svnclient(); void prepareUpdate(bool ask); - template KDialogBase* createDialog(T**ptr,const QString&_head,bool OkCance=false, + template KDialogBase* createDialog(T**ptr,const TQString&_head,bool OkCance=false, const char*name="standard_dialog", bool showHelp=false,bool modal=true, const KGuiItem&u1 = KGuiItem()); - bool makeGet(const svn::Revision&start, const QString&what,const QString&target, - const svn::Revision&peg=svn::Revision::UNDEFINED,QWidget*dlgparent=0); + bool makeGet(const svn::Revision&start, const TQString&what,const TQString&target, + const svn::Revision&peg=svn::Revision::UNDEFINED,TQWidget*dlgtqparent=0); - bool addItems(const QValueList &items,svn::Depth depth=svn::DepthEmpty); - bool addItems(const QStringList&w,svn::Depth depth=svn::DepthEmpty); - void checkAddItems(const QString&path,bool print_error_box=true); + bool addItems(const TQValueList &items,svn::Depth depth=svn::DepthEmpty); + bool addItems(const TQStringList&w,svn::Depth depth=svn::DepthEmpty); + void checkAddItems(const TQString&path,bool print_error_box=true); bool makeDelete(const svn::Pathes&); - bool makeDelete(const QStringList&); - void makeLock(const QStringList&,const QString&,bool); - void makeUnlock(const QStringList&,bool); - - bool makeStatus(const QString&what, svn::StatusEntries&dlist, svn::Revision&where, bool rec=false,bool all=true); - bool makeStatus(const QString&what, svn::StatusEntries&dlist, svn::Revision&where, bool rec,bool all,bool display_ignored,bool updates=false); - bool makeList(const QString&url,svn::DirEntries&dlist,svn::Revision&where,bool rec=false); - - bool createModifiedCache(const QString&base); - bool checkModifiedCache(const QString&path); - bool checkConflictedCache(const QString&path); - bool checkReposLockCache(const QString&path); - bool checkReposLockCache(const QString&path,svn::SharedPointer&t); + bool makeDelete(const TQStringList&); + void makeLock(const TQStringList&,const TQString&,bool); + void makeUnlock(const TQStringList&,bool); + + bool maketqStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where, bool rec=false,bool all=true); + bool maketqStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where, bool rec,bool all,bool display_ignored,bool updates=false); + bool makeList(const TQString&url,svn::DirEntries&dlist,svn::Revision&where,bool rec=false); + + bool createModifiedCache(const TQString&base); + bool checkModifiedCache(const TQString&path); + bool checkConflictedCache(const TQString&path); + bool checkReposLockCache(const TQString&path); + bool checkReposLockCache(const TQString&path,svn::SharedPointer&t); void addModifiedCache(const svn::StatusPtr&what); - void deleteFromModifiedCache(const QString&what); + void deleteFromModifiedCache(const TQString&what); bool makeIgnoreEntry(SvnItem*which,bool unignore); bool isLockNeeded(SvnItem*which,const svn::Revision&where); - QString searchProperty(QString&store, const QString&property, const QString&start,const svn::Revision&where,bool up=false); - svn::PathPropertiesMapListPtr propList(const QString&which,const svn::Revision&where,bool cacheOnly); + TQString searchProperty(TQString&store, const TQString&property, const TQString&start,const svn::Revision&where,bool up=false); + svn::PathPropertiesMapListPtr propList(const TQString&which,const svn::Revision&where,bool cacheOnly); - bool changeProperties(const svn::PropertiesMap&setList,const QValueList&,const QString&path); + bool changeProperties(const svn::PropertiesMap&setList,const TQValueList&,const TQString&path); //! generate and displays a revision tree /*! @@ -122,66 +123,66 @@ public: * \param startr startrevision for log * \param endr endrevision for log */ - void makeTree(const QString&what,const svn::Revision&rev, + void makeTree(const TQString&what,const svn::Revision&rev, const svn::Revision&startr=svn::Revision(1), const svn::Revision&endr=svn::Revision::HEAD); void makeLog(const svn::Revision&start,const svn::Revision&end,const svn::Revision&peg,SvnItem*k,bool list_files=false,int limit = 0); - void makeLog(const svn::Revision&start,const svn::Revision&end,const svn::Revision&peg,const QString&,bool list_files=false, int limit=0); - svn::SharedPointer getLog(const svn::Revision&start,const svn::Revision& end,const svn::Revision&peg,const QString&,bool list_files, int limit,QWidget*parent=0); - virtual bool getSingleLog(svn::LogEntry&,const svn::Revision&,const QString&,const svn::Revision&,QString&root); + void makeLog(const svn::Revision&start,const svn::Revision&end,const svn::Revision&peg,const TQString&,bool list_files=false, int limit=0); + svn::SharedPointer getLog(const svn::Revision&start,const svn::Revision& end,const svn::Revision&peg,const TQString&,bool list_files, int limit,TQWidget*tqparent=0); + virtual bool getSingleLog(svn::LogEntry&,const svn::Revision&,const TQString&,const svn::Revision&,TQString&root); void makeBlame(const svn::Revision&start, const svn::Revision&end, SvnItem*k); - void makeBlame(const svn::Revision&start, const svn::Revision&end, const QString&,QWidget*parent=0,const svn::Revision&peg=svn::Revision::UNDEFINED,SimpleLogCb*_acb=0); - void makeUpdate(const QStringList&what,const svn::Revision&rev,bool recurse); - bool makeSwitch(const QString&rUrl,const QString&tPath,const svn::Revision&r,svn::Depth depth,const svn::Revision&peg,bool stickydepth,bool ignore_externals,bool allow_unversioned); - bool makeSwitch(const QString&path,const QString&what); - bool makeRelocate(const QString&fUrl,const QString&tUrl,const QString&path,bool rec = true); - bool makeCheckout(const QString&,const QString&,const svn::Revision&,const svn::Revision&,svn::Depth,bool isExport,bool openit,bool ignore_externals,bool overwrite,QWidget*p); - void makeInfo(QPtrList lst,const svn::Revision&,const svn::Revision&,bool recursive = true); - void makeInfo(const QStringList&lst,const svn::Revision&,const svn::Revision&,bool recursive = true); + void makeBlame(const svn::Revision&start, const svn::Revision&end, const TQString&,TQWidget*tqparent=0,const svn::Revision&peg=svn::Revision::UNDEFINED,SimpleLogCb*_acb=0); + void makeUpdate(const TQStringList&what,const svn::Revision&rev,bool recurse); + bool makeSwitch(const TQString&rUrl,const TQString&tPath,const svn::Revision&r,svn::Depth depth,const svn::Revision&peg,bool stickydepth,bool ignore_externals,bool allow_unversioned); + bool makeSwitch(const TQString&path,const TQString&what); + bool makeRelocate(const TQString&fUrl,const TQString&tUrl,const TQString&path,bool rec = true); + bool makeCheckout(const TQString&,const TQString&,const svn::Revision&,const svn::Revision&,svn::Depth,bool isExport,bool openit,bool ignore_externals,bool overwrite,TQWidget*p); + void makeInfo(TQPtrList lst,const svn::Revision&,const svn::Revision&,bool recursive = true); + void makeInfo(const TQStringList&lst,const svn::Revision&,const svn::Revision&,bool recursive = true); bool makeCommit(const svn::Targets&); - void CheckoutExport(const QString&what,bool _exp,bool urlisTarget=false); - - QString getInfo(QPtrList lst,const svn::Revision&rev,const svn::Revision&peg,bool recursive,bool all=true); - QString getInfo(const QString&_what,const svn::Revision&rev,const svn::Revision&peg,bool recursive,bool all=true); - - QString makeMkdir(const QString&); - bool makeMkdir(const QStringList&,const QString&); - bool isLocalWorkingCopy(const KURL&url,QString&_baseUri); - bool createUpdateCache(const QString&what); - bool checkUpdateCache(const QString&path)const; - bool isUpdated(const QString&path)const; - bool getUpdated(const QString&path,svn::SharedPointer&d)const; + void CheckoutExport(const TQString&what,bool _exp,bool urlisTarget=false); + + TQString getInfo(TQPtrList lst,const svn::Revision&rev,const svn::Revision&peg,bool recursive,bool all=true); + TQString getInfo(const TQString&_what,const svn::Revision&rev,const svn::Revision&peg,bool recursive,bool all=true); + + TQString makeMkdir(const TQString&); + bool makeMkdir(const TQStringList&,const TQString&); + bool isLocalWorkingCopy(const KURL&url,TQString&_baseUri); + bool createUpdateCache(const TQString&what); + bool checkUpdateCache(const TQString&path)const; + bool isUpdated(const TQString&path)const; + bool getUpdated(const TQString&path,svn::SharedPointer&d)const; void clearUpdateCache(); - void removeFromUpdateCache(const QStringList&what,bool exact_only); + void removeFromUpdateCache(const TQStringList&what,bool exact_only); void stopCheckModThread(); void stopCheckUpdateThread(); - void startFillCache(const QString&path); + void startFillCache(const TQString&path); void stopFillCache(); void stopMain(); void killallThreads(); bool checkUpdatesRunning(); - void getaddedItems(const QString&path,svn::StatusEntries&target); + void getaddedItems(const TQString&path,svn::StatusEntries&target); - bool makeCopy(const QString&,const QString&,const svn::Revision&rev); - bool makeCopy(const KURL::List&,const QString&,const svn::Revision&rev); + bool makeCopy(const TQString&,const TQString&,const svn::Revision&rev); + bool makeCopy(const KURL::List&,const TQString&,const svn::Revision&rev); - bool makeMove(const QString&,const QString&,bool); - bool makeMove(const KURL::List&,const QString&,bool); + bool makeMove(const TQString&,const TQString&,bool); + bool makeMove(const KURL::List&,const TQString&,bool); - virtual bool makeCleanup(const QString&); + virtual bool makeCleanup(const TQString&); - bool get(const QString&what,const QString& to,const svn::Revision&rev,const svn::Revision&peg,QWidget*p); - bool singleInfo(const QString&what,const svn::Revision&rev,svn::InfoEntry&target,const svn::Revision&_peg=svn::Revision::UNDEFINED); + bool get(const TQString&what,const TQString& to,const svn::Revision&rev,const svn::Revision&peg,TQWidget*p); + bool singleInfo(const TQString&what,const svn::Revision&rev,svn::InfoEntry&target,const svn::Revision&_peg=svn::Revision::UNDEFINED); - void setContextData(const QString&,const QString&); + void setContextData(const TQString&,const TQString&); void clearContextData(); - QString getContextData(const QString&)const; + TQString getContextData(const TQString&)const; bool threadRunning(ThreadType which); - virtual void customEvent ( QCustomEvent * e ); + virtual void customEvent ( TQCustomEvent * e ); bool doNetworking(); @@ -193,13 +194,13 @@ protected: void makeAdd(bool rec); CheckModifiedThread*m_CThread,*m_UThread; FillCacheThread*m_FCThread; - void makeDiffinternal(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*,const svn::Revision&peg=svn::Revision::UNDEFINED); - void makeDiffExternal(const QString&p1,const svn::Revision&start,const QString&p2,const svn::Revision&end,const svn::Revision&_peg,bool isDir,QWidget*p,bool rec=true); + void makeDiffinternal(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*,const svn::Revision&peg=svn::Revision::UNDEFINED); + void makeDiffExternal(const TQString&p1,const svn::Revision&start,const TQString&p2,const svn::Revision&end,const svn::Revision&_peg,bool isDir,TQWidget*p,bool rec=true); public slots: - virtual void dispDiff(const QByteArray&); + virtual void dispDiff(const TQByteArray&); virtual void slotProperties(); - virtual void slotNotifyMessage(const QString&); + virtual void slotNotifyMessage(const TQString&); virtual void slotCommit(); virtual void slotUpdateHeadRec(); virtual void slotUpdateTo(); @@ -210,38 +211,38 @@ public slots: virtual void slotCheckout(); virtual void slotExport(); virtual void slotRevert(); - virtual void slotRevertItems(const QStringList&); + virtual void slotRevertItems(const TQStringList&); virtual void slotSwitch(); - virtual void slotResolved(const QString&); - virtual void slotResolve(const QString&); - virtual void makeDiff(const QString&,const svn::Revision&,const svn::Revision&,const svn::Revision&_peg,bool isDir); - virtual void makeDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&); - virtual void makeDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,const svn::Revision&,bool,QWidget*p); - virtual void makeDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*); - virtual void makeNorecDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*); - virtual void slotImport(const QString&,const QString&,const QString&,svn::Depth,bool noIgnore,bool noUnknown); - virtual void slotMergeWcRevisions(const QString&,const svn::Revision&,const svn::Revision&,bool,bool,bool,bool); - virtual void slotMerge(const QString&,const QString&, const QString&, + virtual void slotResolved(const TQString&); + virtual void slotResolve(const TQString&); + virtual void makeDiff(const TQString&,const svn::Revision&,const svn::Revision&,const svn::Revision&_peg,bool isDir); + virtual void makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&); + virtual void makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,const svn::Revision&,bool,TQWidget*p); + virtual void makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*); + virtual void makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*); + virtual void slotImport(const TQString&,const TQString&,const TQString&,svn::Depth,bool noIgnore,bool noUnknown); + virtual void slotMergeWcRevisions(const TQString&,const svn::Revision&,const svn::Revision&,bool,bool,bool,bool); + virtual void slotMerge(const TQString&,const TQString&, const TQString&, const svn::Revision&,const svn::Revision&,const svn::Revision&, bool,bool,bool,bool); - virtual void slotMergeExternal(const QString&src1,const QString&src2, const QString&target, + virtual void slotMergeExternal(const TQString&src1,const TQString&src2, const TQString&target, const svn::Revision&rev1,const svn::Revision&rev2,const svn::Revision&_peg,bool); - virtual void slotExtraLogMsg(const QString&); - virtual void slotMakeCat(const svn::Revision&start, const QString&what,const QString&disp,const svn::Revision&peg,QWidget*dlgparent); + virtual void slotExtraLogMsg(const TQString&); + virtual void slotMakeCat(const svn::Revision&start, const TQString&what,const TQString&disp,const svn::Revision&peg,TQWidget*dlgtqparent); virtual void slotCancel(bool); signals: - void clientException(const QString&); - void sendNotify(const QString&); + void clientException(const TQString&); + void sendNotify(const TQString&); void reinitItem(SvnItem*); void sigRefreshAll(); void sigThreadsChanged(); void sigRefreshCurrent(SvnItem*); void sigRefreshIcons(bool); - void sigExtraLogMsg(const QString&); - void sigGotourl(const QString&); - void sigCacheStatus(Q_LONG,Q_LONG); + void sigExtraLogMsg(const TQString&); + void sigGotourl(const TQString&); + void sigCachetqStatus(TQ_LONG,TQ_LONG); protected slots: virtual void wroteStdin(KProcess*); diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp index 2021169..c7388d3 100644 --- a/src/svnfrontend/svnfiletip.cpp +++ b/src/svnfrontend/svnfiletip.cpp @@ -26,38 +26,38 @@ #include #include -#include -#include -#include -#include -#include -#include - -SvnFileTip::SvnFileTip(QScrollView*parent) - : QFrame( 0, 0, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM ), +#include +#include +#include +#include +#include +#include + +SvnFileTip::SvnFileTip(TQScrollView*tqparent) + : TQFrame( 0, 0, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM ), m_on( false ), m_preview( false ), m_filter( false ), m_corner( 0 ), m_num( 0 ), - m_view( parent ), + m_view( tqparent ), m_svnitem( 0 ), m_previewJob( 0 ) { - m_iconLabel = new QLabel(this); - m_textLabel = new QLabel(this); - m_textLabel->setAlignment(Qt::AlignAuto | Qt::AlignTop); + m_iconLabel = new TQLabel(this); + m_textLabel = new TQLabel(this); + m_textLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignTop); - QGridLayout* layout = new QGridLayout(this, 1, 2, 8, 0); - layout->addWidget(m_iconLabel, 0, 0); - layout->addWidget(m_textLabel, 0, 1); - layout->setResizeMode(QLayout::Fixed); + TQGridLayout* tqlayout = new TQGridLayout(this, 1, 2, 8, 0); + tqlayout->addWidget(m_iconLabel, 0, 0); + tqlayout->addWidget(m_textLabel, 0, 1); + tqlayout->setResizeMode(TQLayout::Fixed); - setPalette( QToolTip::palette() ); + setPalette( TQToolTip::palette() ); setMargin( 1 ); - setFrameStyle( QFrame::Plain | QFrame::Box ); + setFrameStyle( TQFrame::Plain | TQFrame::Box ); - m_timer = new QTimer(this); + m_timer = new TQTimer(this); hide(); } @@ -87,7 +87,7 @@ void SvnFileTip::setOptions( bool on, bool preview, int num ) m_num = num; } -void SvnFileTip::setItem(SvnItem*item, const QRect &rect, const QPixmap *pixmap ) +void SvnFileTip::setItem(SvnItem*item, const TQRect &rect, const TQPixmap *pixmap ) { hideTip(); @@ -107,13 +107,13 @@ void SvnFileTip::setItem(SvnItem*item, const QRect &rect, const QPixmap *pixmap if ( pixmap ) m_iconLabel->setPixmap( *pixmap ); else - m_iconLabel->setPixmap( QPixmap() ); + m_iconLabel->setPixmap( TQPixmap() ); } // Don't start immediately, because the user could move the mouse over another item // This avoids a quick sequence of started preview-jobs m_timer->disconnect( this ); - connect(m_timer, SIGNAL(timeout()), this, SLOT(startDelayed())); + connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(startDelayed())); m_timer->start( 300, true ); } else { m_timer->stop(); @@ -124,11 +124,11 @@ void SvnFileTip::reposition() { if ( m_rect.isEmpty() || !m_view || !m_view->viewport() ) return; - QRect rect = m_rect; - QPoint off = m_view->viewport()->mapToGlobal( m_view->contentsToViewport( rect.topRight() ) ); + TQRect rect = m_rect; + TQPoint off = m_view->viewport()->mapToGlobal( m_view->contentsToViewport( rect.topRight() ) ); rect.moveTopRight( off ); - QPoint pos = rect.center(); + TQPoint pos = rect.center(); // m_corner: // 0: upperleft // 1: upperright @@ -137,7 +137,7 @@ void SvnFileTip::reposition() // 4+: none m_corner = 0; // should the tooltip be shown to the left or to the right of the ivi ? - QRect desk = KGlobalSettings::desktopGeometry(rect.center()); + TQRect desk = KGlobalSettings::desktopGeometry(rect.center()); if (rect.center().x() + width() > desk.right()) { // to the left @@ -162,7 +162,7 @@ void SvnFileTip::reposition() update(); } -void SvnFileTip::gotPreview( const KFileItem* item, const QPixmap& pixmap ) +void SvnFileTip::gotPreview( const KFileItem* item, const TQPixmap& pixmap ) { m_previewJob = 0; if (!m_svnitem || item != m_svnitem->fileItem()) return; @@ -175,7 +175,7 @@ void SvnFileTip::gotPreviewResult() m_previewJob = 0; } -void SvnFileTip::drawContents( QPainter *p ) +void SvnFileTip::drawContents( TQPainter *p ) { static const char * const names[] = { "arrow_topleft", @@ -185,14 +185,14 @@ void SvnFileTip::drawContents( QPainter *p ) }; if (m_corner >= 4) { // 4 is empty, so don't draw anything - QFrame::drawContents( p ); + TQFrame::drawContents( p ); return; } if ( m_corners[m_corner].isNull()) - m_corners[m_corner].load( locate( "data", QString::fromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) ); + m_corners[m_corner].load( locate( "data", TQString::tqfromLatin1( "konqueror/pics/%1.png" ).tqarg( names[m_corner] ) ) ); - QPixmap &pix = m_corners[m_corner]; + TQPixmap &pix = m_corners[m_corner]; switch ( m_corner ) { @@ -210,7 +210,7 @@ void SvnFileTip::drawContents( QPainter *p ) break; } - QFrame::drawContents( p ); + TQFrame::drawContents( p ); } void SvnFileTip::setFilter( bool enable ) @@ -219,10 +219,10 @@ void SvnFileTip::setFilter( bool enable ) if ( enable ) { kapp->installEventFilter( this ); - QApplication::setGlobalMouseTracking( true ); + TQApplication::setGlobalMouseTracking( true ); } else { - QApplication::setGlobalMouseTracking( false ); + TQApplication::setGlobalMouseTracking( false ); kapp->removeEventFilter( this ); } m_filter = enable; @@ -234,12 +234,12 @@ void SvnFileTip::showTip() hide(); return; } - QString text = m_svnitem->getToolTipText(); + TQString text = m_svnitem->getToolTipText(); if ( text.isEmpty() ) return; m_timer->disconnect( this ); - connect(m_timer, SIGNAL(timeout()), this, SLOT(hideTip())); + connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hideTip())); m_timer->start( 15000, true ); m_textLabel->setText( text ); @@ -269,35 +269,35 @@ void SvnFileTip::startDelayed() oneItem.append( m_svnitem->fileItem() ); m_previewJob = KIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0); - connect( m_previewJob, SIGNAL( gotPreview( const KFileItem *, const QPixmap & ) ), - this, SLOT( gotPreview( const KFileItem *, const QPixmap & ) ) ); - connect( m_previewJob, SIGNAL( result( KIO::Job * ) ), - this, SLOT( gotPreviewResult() ) ); + connect( m_previewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ), + this, TQT_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) ); + connect( m_previewJob, TQT_SIGNAL( result( KIO::Job * ) ), + this, TQT_SLOT( gotPreviewResult() ) ); } m_timer->disconnect( this ); - connect(m_timer, SIGNAL(timeout()), this, SLOT(showTip())); + connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showTip())); m_timer->start( 400, true ); } -void SvnFileTip::resizeEvent( QResizeEvent* event ) +void SvnFileTip::resizeEvent( TQResizeEvent* event ) { - QFrame::resizeEvent(event); + TQFrame::resizeEvent(event); reposition(); } -bool SvnFileTip::eventFilter( QObject *, QEvent *e ) +bool SvnFileTip::eventFilter( TQObject *, TQEvent *e ) { switch ( e->type() ) { - case QEvent::Leave: - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - case QEvent::KeyPress: - case QEvent::KeyRelease: - case QEvent::FocusIn: - case QEvent::FocusOut: - case QEvent::Wheel: + case TQEvent::Leave: + case TQEvent::MouseButtonPress: + case TQEvent::MouseButtonRelease: + case TQEvent::KeyPress: + case TQEvent::KeyRelease: + case TQEvent::FocusIn: + case TQEvent::FocusOut: + case TQEvent::Wheel: hideTip(); default: break; } diff --git a/src/svnfrontend/svnfiletip.h b/src/svnfrontend/svnfiletip.h index d63cf97..e275d2d 100644 --- a/src/svnfrontend/svnfiletip.h +++ b/src/svnfrontend/svnfiletip.h @@ -24,24 +24,25 @@ #ifndef SVNFILETIP_H #define SVNFILETIP_H -#include -#include +#include +#include #include class KFileItem; -class QLabel; -class QScrollView; -class QTimer; +class TQLabel; +class TQScrollView; +class TQTimer; class SvnItem; /** @author Rajko Albrecht */ -class SvnFileTip : public QFrame +class SvnFileTip : public TQFrame { Q_OBJECT + TQ_OBJECT public: - SvnFileTip(QScrollView*parent); + SvnFileTip(TQScrollView*tqparent); virtual ~SvnFileTip(); void setPreview(bool on); @@ -57,17 +58,17 @@ public: @param rect the rectangle around which the tip will be shown @param pixmap the pixmap to be shown. If 0, no pixmap is shown */ - void setItem(SvnItem*item, const QRect &rect = QRect(), - const QPixmap *pixmap = 0 ); + void setItem(SvnItem*item, const TQRect &rect = TQRect(), + const TQPixmap *pixmap = 0 ); - virtual bool eventFilter( QObject *, QEvent *e ); + virtual bool eventFilter( TQObject *, TQEvent *e ); protected: - virtual void drawContents( QPainter *p ); - virtual void resizeEvent( QResizeEvent * ); + virtual void drawContents( TQPainter *p ); + virtual void resizeEvent( TQResizeEvent * ); private slots: - void gotPreview( const KFileItem*, const QPixmap& ); + void gotPreview( const KFileItem*, const TQPixmap& ); void gotPreviewResult(); void startDelayed(); @@ -79,19 +80,19 @@ public: void reposition(); - QLabel* m_iconLabel; - QLabel* m_textLabel; + TQLabel* m_iconLabel; + TQLabel* m_textLabel; bool m_on : 1; bool m_preview : 1; // shall the preview icon be shown bool m_filter : 1; - QPixmap m_corners[4]; + TQPixmap m_corners[4]; int m_corner; int m_num; - QScrollView* m_view; + TQScrollView* m_view; SvnItem* m_svnitem; KIO::PreviewJob* m_previewJob; - QRect m_rect; - QTimer* m_timer; + TQRect m_rect; + TQTimer* m_timer; }; #endif diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp index 20133d5..83c6aba 100644 --- a/src/svnfrontend/svnitem.cpp +++ b/src/svnfrontend/svnitem.cpp @@ -36,12 +36,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include class SvnItem_p:public svn::ref_count { @@ -57,10 +57,10 @@ public: protected: svn::StatusPtr m_Stat; void init(); - QString m_url,m_full,m_short; + TQString m_url,m_full,m_short; KURL m_kdename; - QDateTime m_fullDate; - QString m_infoText; + TQDateTime m_fullDate; + TQString m_infoText; KFileItem*m_fitem; bool isWc; svn::Revision lRev; @@ -68,7 +68,7 @@ protected: }; SvnItem_p::SvnItem_p() - :ref_count(),m_Stat(new svn::Status()) + :ref_count(),m_Stat(new svn::tqStatus()) { init(); } @@ -94,7 +94,7 @@ void SvnItem_p::init() /* dir name possible */ m_full.truncate(m_full.length()-1); } - int p = m_full.findRev("/"); + int p = m_full.tqfindRev("/"); if (p>-1) { ++p; m_short = m_full.right(m_full.length()-p); @@ -103,7 +103,7 @@ void SvnItem_p::init() } m_url = m_Stat->entry().url(); m_fullDate = svn::DateTime(m_Stat->entry().cmtDate()); - m_infoText = QString::null; + m_infoText = TQString(); m_fitem = 0; } @@ -125,15 +125,15 @@ KMimeType::Ptr SvnItem_p::mimeType(bool dir) const KURL& SvnItem_p::kdeName(const svn::Revision&r) { isWc = !svn::Url::isValid(m_Stat->path()); - QString name; + TQString name; if (!(r==lRev)||m_kdename.isEmpty()) { lRev=r; if (!isWc) { m_kdename = m_Stat->entry().url(); - QString proto; + TQString proto; proto = helpers::KTranslateUrl::makeKdeUrl(m_kdename.protocol()); m_kdename.setProtocol(proto); - QString revstr= lRev.toString(); + TQString revstr= lRev.toString(); if (revstr.length()>0) { m_kdename.setQuery("?rev="+revstr); } @@ -176,17 +176,17 @@ void SvnItem::setStat(const svn::StatusPtr&aStat) p_Item = new SvnItem_p(aStat); } -const QString&SvnItem::fullName()const +const TQString&SvnItem::fullName()const { return (p_Item->m_full); } -const QString&SvnItem::shortName()const +const TQString&SvnItem::shortName()const { return (p_Item->m_short); } -const QString&SvnItem::Url()const +const TQString&SvnItem::Url()const { return (p_Item->m_url); } @@ -197,31 +197,31 @@ bool SvnItem::isDir()const return p_Item->m_Stat->entry().kind()==svn_node_dir; } /* must be a local file */ - QFileInfo f(fullName()); + TQFileInfo f(fullName()); return f.isDir(); } -const QDateTime&SvnItem::fullDate()const +const TQDateTime&SvnItem::fullDate()const { return (p_Item->m_fullDate); } -QPixmap SvnItem::internalTransform(const QPixmap&first,int size) +TQPixmap SvnItem::internalTransform(const TQPixmap&first,int size) { - QPixmap result(size,size); + TQPixmap result(size,size); if (result.isNull()) { return result; } - const QBitmap * b = first.mask(); - result.fill(Qt::white); + const TQBitmap * b = first.tqmask(); + result.fill(TQt::white); if (b) { result.setMask(*b); } else { - QBitmap m(size,size,true); - m.fill(Qt::white); + TQBitmap m(size,size,true); + m.fill(TQt::white); result.setMask(m); } - QPainter pa; + TQPainter pa; pa.begin(&result); int w = first.width()>size?size:first.width(); int h = first.height()>size?size:first.height(); @@ -230,19 +230,19 @@ QPixmap SvnItem::internalTransform(const QPixmap&first,int size) return result; } -QPixmap SvnItem::getPixmap(const QPixmap&_p,int size,bool overlay) +TQPixmap SvnItem::getPixmap(const TQPixmap&_p,int size,bool overlay) { if (!isVersioned()) { m_bgColor = NOTVERSIONED; } else if (isRealVersioned()) { SvnActions*wrap = getWrapper(); bool mod = false; - QPixmap p2 = QPixmap(); - if (p_Item->m_Stat->textStatus()==svn_wc_status_conflicted) { + TQPixmap p2 = TQPixmap(); + if (p_Item->m_Stat->texttqStatus()==svn_wc_status_conflicted) { m_bgColor = CONFLICT; if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnconflicted",KIcon::Desktop,size); - } else if (p_Item->m_Stat->textStatus ()==svn_wc_status_missing) { + } else if (p_Item->m_Stat->texttqStatus ()==svn_wc_status_missing) { m_bgColor = MISSING; } else if (isLocked()||wrap->checkReposLockCache(fullName())) { if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnlocked",KIcon::Desktop,size); @@ -253,10 +253,10 @@ QPixmap SvnItem::getPixmap(const QPixmap&_p,int size,bool overlay) } else if (wrap->isUpdated(p_Item->m_Stat->path())) { if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnupdates",KIcon::Desktop,size); m_bgColor = UPDATES; - } else if (p_Item->m_Stat->textStatus()==svn_wc_status_deleted) { + } else if (p_Item->m_Stat->texttqStatus()==svn_wc_status_deleted) { if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvndeleted",KIcon::Desktop,size); m_bgColor = DELETED; - } else if (p_Item->m_Stat->textStatus()==svn_wc_status_added ) { + } else if (p_Item->m_Stat->texttqStatus()==svn_wc_status_added ) { if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnadded",KIcon::Desktop,size); m_bgColor = ADDED; } else if (isModified()) { @@ -280,15 +280,15 @@ QPixmap SvnItem::getPixmap(const QPixmap&_p,int size,bool overlay) if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnmodified",KIcon::Desktop,size); } if (!p2.isNull()) { - QPixmap p; + TQPixmap p; if (_p.width()!=size || _p.height()!=size) { p = internalTransform(_p,size); } else { p = _p; } m_overlaycolor = true; - QImage i1; i1 = p; - QImage i2;i2 = p2; + TQImage i1; i1 = p; + TQImage i2;i2 = p2; KIconEffect::overlay(i1,i2); p = i1; @@ -298,9 +298,9 @@ QPixmap SvnItem::getPixmap(const QPixmap&_p,int size,bool overlay) return _p; } -QPixmap SvnItem::getPixmap(int size,bool overlay) +TQPixmap SvnItem::getPixmap(int size,bool overlay) { - QPixmap p; + TQPixmap p; m_overlaycolor = false; m_bgColor = NONE; /* yes - different way to "isDir" above 'cause here we try to use the @@ -311,11 +311,11 @@ QPixmap SvnItem::getPixmap(int size,bool overlay) p = p_Item->mimeType(isDir())->pixmap(KIcon::Desktop,size,KIcon::DefaultState); if (isLocked()) { m_bgColor = LOCKED; - QPixmap p2; + TQPixmap p2; if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnlocked",KIcon::Desktop,size); if (!p2.isNull()) { - QImage i1; i1 = p; - QImage i2; i2 = p2; + TQImage i1; i1 = p; + TQImage i2; i2 = p2; KIconEffect::overlay(i1,i2); p = i1; } @@ -347,7 +347,7 @@ bool SvnItem::isValid()const if (isVersioned()) { return true; } - QFileInfo f(fullName()); + TQFileInfo f(fullName()); return f.exists(); } @@ -358,26 +358,26 @@ bool SvnItem::isRealVersioned()const bool SvnItem::isIgnored()const { - return p_Item->m_Stat->textStatus()==svn_wc_status_ignored; + return p_Item->m_Stat->texttqStatus()==svn_wc_status_ignored; } bool SvnItem::isRemoteAdded()const { return getWrapper()->isUpdated(p_Item->m_Stat->path()) && - p_Item->m_Stat->validReposStatus()&&!p_Item->m_Stat->validLocalStatus(); + p_Item->m_Stat->validRepostqStatus()&&!p_Item->m_Stat->validLocaltqStatus(); } -QString SvnItem::infoText()const +TQString SvnItem::infoText()const { - QString info_text = ""; + TQString info_text = ""; if (getWrapper()->isUpdated(p_Item->m_Stat->path())) { - if (p_Item->m_Stat->validReposStatus()&&!p_Item->m_Stat->validLocalStatus()) { + if (p_Item->m_Stat->validRepostqStatus()&&!p_Item->m_Stat->validLocaltqStatus()) { info_text = i18n("Added in repository"); } else { info_text = i18n("Needs update"); } } else { - switch(p_Item->m_Stat->textStatus ()) { + switch(p_Item->m_Stat->texttqStatus ()) { case svn_wc_status_modified: info_text = i18n("Locally modified"); break; @@ -412,7 +412,7 @@ QString SvnItem::infoText()const break; } if (info_text.isEmpty()) { - switch (p_Item->m_Stat->propStatus ()) { + switch (p_Item->m_Stat->proptqStatus ()) { case svn_wc_status_modified: info_text = i18n("Property modified"); break; @@ -424,7 +424,7 @@ QString SvnItem::infoText()const return info_text; } -QString SvnItem::cmtAuthor()const +TQString SvnItem::cmtAuthor()const { return p_Item->m_Stat->entry().cmtAuthor(); } @@ -439,12 +439,12 @@ bool SvnItem::isLocked()const return p_Item->m_Stat->entry().lockEntry().Locked(); } -QString SvnItem::lockOwner()const +TQString SvnItem::lockOwner()const { if (p_Item->m_Stat->entry().lockEntry().Locked()) { return p_Item->m_Stat->entry().lockEntry().Owner(); } - svn::SharedPointer tmp; + svn::SharedPointer tmp; if (getWrapper()->checkReposLockCache(fullName(),tmp) && tmp) { return tmp->lockEntry().Owner(); } @@ -457,8 +457,8 @@ QString SvnItem::lockOwner()const */ bool SvnItem::isModified()const { - return p_Item->m_Stat->textStatus ()==svn_wc_status_modified||p_Item->m_Stat->propStatus()==svn_wc_status_modified - ||p_Item->m_Stat->textStatus ()==svn_wc_status_replaced; + return p_Item->m_Stat->texttqStatus ()==svn_wc_status_modified||p_Item->m_Stat->proptqStatus()==svn_wc_status_modified + ||p_Item->m_Stat->texttqStatus ()==svn_wc_status_replaced; } const svn::StatusPtr& SvnItem::stat()const @@ -472,28 +472,28 @@ const svn::StatusPtr& SvnItem::stat()const */ bool SvnItem::isNormal()const { - return p_Item->m_Stat->textStatus()==svn_wc_status_normal; + return p_Item->m_Stat->texttqStatus()==svn_wc_status_normal; } bool SvnItem::isMissing()const { - return p_Item->m_Stat->textStatus()==svn_wc_status_missing; + return p_Item->m_Stat->texttqStatus()==svn_wc_status_missing; } bool SvnItem::isDeleted()const { - return p_Item->m_Stat->textStatus()==svn_wc_status_deleted; + return p_Item->m_Stat->texttqStatus()==svn_wc_status_deleted; } bool SvnItem::isConflicted()const { - return p_Item->m_Stat->textStatus()==svn_wc_status_conflicted; + return p_Item->m_Stat->texttqStatus()==svn_wc_status_conflicted; } /*! \fn SvnItem::getToolTipText() */ -const QString& SvnItem::getToolTipText() +const TQString& SvnItem::getToolTipText() { if (p_Item->m_infoText.isNull()) { if (isRealVersioned() && !p_Item->m_Stat->entry().url().isEmpty()) { @@ -508,7 +508,7 @@ const QString& SvnItem::getToolTipText() /* local */ } if (wrap) { - QPtrList lst; lst.append(this); + TQPtrList lst; lst.append(this); p_Item->m_infoText = wrap->getInfo(lst,rev,peg,false,false); if (p_Item->m_fitem) p_Item->m_infoText+=p_Item->m_fitem->getToolTipText(0); } diff --git a/src/svnfrontend/svnitem.h b/src/svnfrontend/svnitem.h index ac90172..68dd328 100644 --- a/src/svnfrontend/svnitem.h +++ b/src/svnfrontend/svnitem.h @@ -24,10 +24,10 @@ #include "src/svnqt/smart_pointer.hpp" #include "src/svnqt/svnqttypes.hpp" #include -#include -#include -#include -#include +#include +#include +#include +#include class FileListViewItem; class SvnItem_p; @@ -47,12 +47,12 @@ public: SvnItem(const svn::StatusPtr&); virtual ~SvnItem(); - virtual const QString&fullName()const; - virtual const QString&shortName()const; - virtual const QString&Url()const; + virtual const TQString&fullName()const; + virtual const TQString&shortName()const; + virtual const TQString&Url()const; virtual const KURL&kdeName(const svn::Revision&); virtual KMimeType::Ptr mimeType(); - virtual const QDateTime&fullDate()const; + virtual const TQDateTime&fullDate()const; virtual bool isDir()const; virtual bool isVersioned()const; virtual bool isConflicted()const; @@ -60,18 +60,18 @@ public: virtual bool isRealVersioned()const; virtual bool isIgnored()const; virtual bool isRemoteAdded()const; - virtual QString infoText()const; - virtual QString cmtAuthor()const; + virtual TQString infoText()const; + virtual TQString cmtAuthor()const; virtual long int cmtRev()const; virtual bool isLocked()const; - virtual QString lockOwner()const; - virtual QString getParentDir()const=0; + virtual TQString lockOwner()const; + virtual TQString getParentDir()const=0; virtual SvnItem* getParentItem()const=0; virtual const svn::Revision&correctPeg()const=0; - virtual void refreshStatus(bool childs=false,QPtrList *exclude = 0,bool depsonly=false)=0; + virtual void refreshtqStatus(bool childs=false,TQPtrList *exclude = 0,bool depsonly=false)=0; - QPixmap getPixmap(int size,bool overlay=true); - QPixmap getPixmap(const QPixmap&,int size,bool overlay=true); + TQPixmap getPixmap(int size,bool overlay=true); + TQPixmap getPixmap(const TQPixmap&,int size,bool overlay=true); virtual FileListViewItem*fItem(){return 0;} virtual void setStat(const svn::StatusPtr&); @@ -80,7 +80,7 @@ public: bool isNormal()const; bool isMissing()const; bool isDeleted()const; - const QString& getToolTipText(); + const TQString& getToolTipText(); KFileItem*fileItem(); protected: @@ -101,11 +101,11 @@ protected: svn::smart_pointer p_Item; virtual SvnActions*getWrapper()const = 0; - static QPixmap internalTransform(const QPixmap&,int size); + static TQPixmap internalTransform(const TQPixmap&,int size); }; -typedef QPtrList SvnItemList; -typedef QPtrListIterator SvnItemListIterator; +typedef TQPtrList SvnItemList; +typedef TQPtrListIterator SvnItemListIterator; #endif diff --git a/src/svnfrontend/svnlogdlg.ui b/src/svnfrontend/svnlogdlg.ui index 85038e2..37d2819 100644 --- a/src/svnfrontend/svnlogdlg.ui +++ b/src/svnfrontend/svnlogdlg.ui @@ -1,10 +1,10 @@ SvnLogDialogData - + LogDialog - + 0 0 @@ -19,17 +19,17 @@ unnamed - + - layout5 + tqlayout5 unnamed - + - layout4 + tqlayout4 @@ -48,7 +48,7 @@ m_endRevButton - + endLabel @@ -56,7 +56,7 @@ End revision - + startLabel @@ -81,7 +81,7 @@ Expanding - + 107 20 @@ -90,7 +90,7 @@ - + m_centralSplitter @@ -186,7 +186,7 @@ Select in first column revisions for diff - + m_rightSplitter @@ -244,9 +244,9 @@ - + - layout3 + tqlayout3 @@ -321,7 +321,7 @@ Expanding - + 42 20 @@ -383,15 +383,15 @@ m_LogView - selectionChanged(QListViewItem*) + selectionChanged(TQListViewItem*) LogDialog - slotSelectionChanged(QListViewItem*) + slotSelectionChanged(TQListViewItem*) m_LogView - mouseButtonClicked(int,QListViewItem*,const QPoint&,int) + mouseButtonClicked(int,TQListViewItem*,const QPoint&,int) LogDialog - slotItemClicked(int,QListViewItem*,const QPoint&,int) + slotItemClicked(int,TQListViewItem*,const QPoint&,int) m_DispSpecDiff @@ -419,15 +419,15 @@ m_ChangedList - contextMenuRequested(QListViewItem*,const QPoint&,int) + contextMenuRequested(TQListViewItem*,const QPoint&,int) LogDialog - slotSingleContext(QListViewItem*,const QPoint&,int) + slotSingleContext(TQListViewItem*,const QPoint&,int) m_ChangedList - doubleClicked(QListViewItem*) + doubleClicked(TQListViewItem*) LogDialog - slotSingleDoubleClicked(QListViewItem*) + slotSingleDoubleClicked(TQListViewItem*) m_startRevButton @@ -448,21 +448,21 @@ slotGetLogs() - - slotSelectionChanged(QListViewItem*) - slotItemChanged(QListViewItem*) + + slotSelectionChanged(TQListViewItem*) + slotItemChanged(TQListViewItem*) slotDispPrevious() - slotItemClicked(int,QListViewItem*,const QPoint &,int) + slotItemClicked(int,TQListViewItem*,const QPoint &,int) slotDispSelected() slotListEntries() slotBlameItem() slotEntriesSelectionChanged() - slotSingleContext(QListViewItem*, const QPoint &, int) - slotSingleDoubleClicked(QListViewItem*) + slotSingleContext(TQListViewItem*, const QPoint &, int) + slotSingleDoubleClicked(TQListViewItem*) slotRevisionSelected() slotGetLogs() - - + + kpushbutton.h revisionbuttonimpl.h 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); } } diff --git a/src/svnfrontend/svnlogdlgimp.h b/src/svnfrontend/svnlogdlgimp.h index 620f894..e467aa3 100644 --- a/src/svnfrontend/svnlogdlgimp.h +++ b/src/svnfrontend/svnlogdlgimp.h @@ -26,8 +26,8 @@ #include "src/svnqt/client.hpp" #include "src/svnqt/shared_pointer.hpp" -#include -#include +#include +#include class LogListViewItem; class SvnActions; @@ -35,53 +35,54 @@ class SvnActions; class SvnLogDlgImp: public SvnLogDialogData,public SimpleLogCb { Q_OBJECT + TQ_OBJECT public: - SvnLogDlgImp(SvnActions*,QWidget *parent = 0, const char *name = 0,bool modal=true); + SvnLogDlgImp(SvnActions*,TQWidget *tqparent = 0, const char *name = 0,bool modal=true); virtual ~SvnLogDlgImp(); - void dispLog(const svn::SharedPointer&,const QString&,const QString&,const svn::Revision&peg,const QString&pegUrl); + void dispLog(const svn::SharedPointer&,const TQString&,const TQString&,const svn::Revision&peg,const TQString&pegUrl); void saveSize(); - QSize dialogSize(); + TQSize dialogSize(); - virtual bool getSingleLog(svn::LogEntry&t,const svn::Revision&r,const QString&what,const svn::Revision&peg,QString&root); + virtual bool getSingleLog(svn::LogEntry&t,const svn::Revision&r,const TQString&what,const svn::Revision&peg,TQString&root); signals: - void makeDiff(const QString&,const svn::Revision&,const QString&,const svn::Revision&,QWidget*); - void makeCat(const svn::Revision&,const QString&,const QString&,const svn::Revision&,QWidget*); + void makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*); + void makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*); protected slots: - virtual void slotSelectionChanged(QListViewItem*); + virtual void slotSelectionChanged(TQListViewItem*); protected slots: virtual void slotDispPrevious(); virtual void slotDispSelected(); - virtual void slotItemClicked(int,QListViewItem*,const QPoint &,int); + virtual void slotItemClicked(int,TQListViewItem*,const TQPoint &,int); virtual void slotRevisionSelected(); protected: - QString _name; - QString _base; + TQString _name; + TQString _base; static const char* groupName; LogListViewItem *m_first,*m_second; SvnActions*m_Actions; bool m_ControlKeyDown; - virtual void keyPressEvent (QKeyEvent * e); - virtual void keyReleaseEvent (QKeyEvent * e); + virtual void keyPressEvent (TQKeyEvent * e); + virtual void keyReleaseEvent (TQKeyEvent * e); virtual void slotBlameItem(); svn::SharedPointer m_Entries; - QString _bugurl; + TQString _bugurl; void dispLog(const svn::SharedPointer&); - QRegExp _r1,_r2; + TQRegExp _r1,_r2; protected slots: virtual void slotListEntries(); virtual void slotEntriesSelectionChanged(); - virtual void slotSingleContext(QListViewItem*, const QPoint &, int); - virtual void slotSingleDoubleClicked(QListViewItem*); + virtual void slotSingleContext(TQListViewItem*, const TQPoint &, int); + virtual void slotSingleDoubleClicked(TQListViewItem*); virtual void slotGetLogs(); protected: - void replaceBugids(QString&msg); - QString genReplace(const QString&); + void replaceBugids(TQString&msg); + TQString genReplace(const TQString&); svn::Revision m_peg; svn::Path m_PegUrl; }; diff --git a/src/svnfrontend/tcontextlistener.cpp b/src/svnfrontend/tcontextlistener.cpp index 0d90de2..ffa0e4e 100644 --- a/src/svnfrontend/tcontextlistener.cpp +++ b/src/svnfrontend/tcontextlistener.cpp @@ -30,8 +30,8 @@ #include #include -ThreadContextListener::ThreadContextListener(QObject* parent, const char* name) - : CContextListener(parent, name) +ThreadContextListener::ThreadContextListener(TQObject* tqparent, const char* name) + : CContextListener(tqparent, name) { m_Data = new ThreadContextListenerData; } @@ -41,15 +41,15 @@ ThreadContextListener::~ThreadContextListener() delete m_Data; } -QMutex*ThreadContextListener::callbackMutex() +TQMutex*ThreadContextListener::callbackMutex() { - static QMutex s_CallbackMutex; + static TQMutex s_CallbackMutex; return &s_CallbackMutex; } -bool ThreadContextListener::contextGetLogin(const QString& realm, QString& username, QString& password, bool& maySave) +bool ThreadContextListener::contextGetLogin(const TQString& realm, TQString& username, TQString& password, bool& maySave) { - QMutexLocker lock(callbackMutex()); + TQMutexLocker lock(callbackMutex()); m_WaitMutex.lock(); ThreadContextListenerData::slogin_data _data; _data.realm=realm; @@ -58,7 +58,7 @@ bool ThreadContextListener::contextGetLogin(const QString& realm, QString& usern _data.maysave=maySave; _data.ok=false; - QCustomEvent*ev = new QCustomEvent(EVENT_THREAD_LOGIN_PROMPT); + TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_LOGIN_PROMPT); void*t = (void*)&_data; ev->setData(t); kapp->postEvent(this,ev); @@ -70,9 +70,9 @@ bool ThreadContextListener::contextGetLogin(const QString& realm, QString& usern return _data.ok; } -bool ThreadContextListener::contextGetSavedLogin(const QString & realm,QString & username,QString & password) +bool ThreadContextListener::contextGetSavedLogin(const TQString & realm,TQString & username,TQString & password) { - QMutexLocker lock(callbackMutex()); + TQMutexLocker lock(callbackMutex()); m_WaitMutex.lock(); ThreadContextListenerData::slogin_data _data; _data.realm=realm; @@ -81,7 +81,7 @@ bool ThreadContextListener::contextGetSavedLogin(const QString & realm,QString & _data.maysave=false; _data.ok=false; - QCustomEvent*ev = new QCustomEvent(EVENT_THREAD_LOGIN_SAVED); + TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_LOGIN_SAVED); void*t = (void*)&_data; ev->setData(t); kapp->postEvent(this,ev); @@ -92,15 +92,15 @@ bool ThreadContextListener::contextGetSavedLogin(const QString & realm,QString & return _data.ok; } -bool ThreadContextListener::contextGetLogMessage(QString& msg,const svn::CommitItemList&_items) +bool ThreadContextListener::contextGetLogMessage(TQString& msg,const svn::CommitItemList&_items) { - QMutexLocker lock(callbackMutex()); + TQMutexLocker lock(callbackMutex()); m_WaitMutex.lock(); ThreadContextListenerData::slog_message log; log.ok = false; log.msg = ""; log._items = &_items; - QCustomEvent*ev = new QCustomEvent(EVENT_THREAD_LOGMSG_PROMPT); + TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_LOGMSG_PROMPT); void*t = (void*)&log; ev->setData(t); kapp->postEvent(this,ev); @@ -110,15 +110,15 @@ bool ThreadContextListener::contextGetLogMessage(QString& msg,const svn::CommitI return log.ok; } -bool ThreadContextListener::contextSslClientCertPrompt(QString& certFile) +bool ThreadContextListener::contextSslClientCertPrompt(TQString& certFile) { - QMutexLocker lock(callbackMutex()); + TQMutexLocker lock(callbackMutex()); m_WaitMutex.lock(); ThreadContextListenerData::scert_file scertf; scertf.ok = false; scertf.certfile=""; - QCustomEvent*ev = new QCustomEvent(EVENT_THREAD_CERT_SELECT_PROMPT); + TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_CERT_SELECT_PROMPT); ev->setData((void*)&scertf); kapp->postEvent(this,ev); m_Data->m_trustpromptWait.wait(&m_WaitMutex); @@ -127,16 +127,16 @@ bool ThreadContextListener::contextSslClientCertPrompt(QString& certFile) return scertf.ok; } -bool ThreadContextListener::contextSslClientCertPwPrompt(QString& password, const QString& realm, bool& maySave) +bool ThreadContextListener::contextSslClientCertPwPrompt(TQString& password, const TQString& realm, bool& maySave) { - QMutexLocker lock(callbackMutex()); + TQMutexLocker lock(callbackMutex()); m_WaitMutex.lock(); ThreadContextListenerData::scert_pw scert_data; scert_data.ok=false; scert_data.maysave=false; scert_data.password=""; scert_data.realm=realm; - QCustomEvent*ev = new QCustomEvent(EVENT_THREAD_CERT_PW_PROMPT); + TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_CERT_PW_PROMPT); ev->setData((void*)&scert_data); kapp->postEvent(this,ev); m_Data->m_trustpromptWait.wait(&m_WaitMutex); @@ -148,9 +148,9 @@ bool ThreadContextListener::contextSslClientCertPwPrompt(QString& password, cons svn::ContextListener::SslServerTrustAnswer ThreadContextListener::contextSslServerTrustPrompt(const SslServerTrustData& data, apr_uint32_t&/* acceptedFailures*/) { - QMutexLocker lock(callbackMutex()); + TQMutexLocker lock(callbackMutex()); m_WaitMutex.lock(); - QCustomEvent*ev = new QCustomEvent(EVENT_THREAD_SSL_TRUST_PROMPT); + TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_SSL_TRUST_PROMPT); ThreadContextListenerData::strust_answer trust_answer; trust_answer.m_SslTrustAnswer=DONT_ACCEPT; trust_answer.m_Trustdata = &data; @@ -161,10 +161,10 @@ svn::ContextListener::SslServerTrustAnswer ThreadContextListener::contextSslServ return trust_answer.m_SslTrustAnswer; } -void ThreadContextListener::contextNotify(const QString&aMsg) +void ThreadContextListener::contextNotify(const TQString&aMsg) { - QMutexLocker lock(callbackMutex()); - QCustomEvent*ev = new QCustomEvent(EVENT_THREAD_NOTIFY); + TQMutexLocker lock(callbackMutex()); + TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_NOTIFY); // receiver must delete data! ThreadContextListenerData::snotify* _notify = new ThreadContextListenerData::snotify(); _notify->msg = aMsg; @@ -180,17 +180,17 @@ void ThreadContextListener::contextProgress(long long int current, long long int if (m_Data->noProgress||current==0) { return; } - QMutexLocker lock(callbackMutex()); - QCustomEvent*ev = new QCustomEvent(EVENT_THREAD_NOTIFY); + TQMutexLocker lock(callbackMutex()); + TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_NOTIFY); // receiver must delete data! ThreadContextListenerData::snotify* _notify = new ThreadContextListenerData::snotify(); - QString msg; - QString s1 = helpers::ByteToString()(current); + TQString msg; + TQString s1 = helpers::ByteToString()(current); if (max>-1) { - QString s2 = helpers::ByteToString()(max); - msg = i18n("%1 of %2 transferred.").arg(s1).arg(s2); + TQString s2 = helpers::ByteToString()(max); + msg = i18n("%1 of %2 transferred.").tqarg(s1).tqarg(s2); } else { - msg = i18n("%1 transferred.").arg(s1); + msg = i18n("%1 transferred.").tqarg(s1); } _notify->msg = msg; ev->setData((void*)_notify); @@ -199,8 +199,8 @@ void ThreadContextListener::contextProgress(long long int current, long long int void ThreadContextListener::sendTick() { - QMutexLocker lock(callbackMutex()); - QCustomEvent*ev = new QCustomEvent(EVENT_THREAD_NOTIFY); + TQMutexLocker lock(callbackMutex()); + TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_NOTIFY); // receiver must delete data! ThreadContextListenerData::snotify* _notify = new ThreadContextListenerData::snotify(); _notify->msg = ""; @@ -211,7 +211,7 @@ void ThreadContextListener::sendTick() /* methods below may only called from mainthread! (via event) */ void ThreadContextListener::event_contextGetLogin(void*data) { - QMutexLocker lock(&m_WaitMutex); + TQMutexLocker lock(&m_WaitMutex); if (!data) { m_Data->m_trustpromptWait.wakeAll(); return; @@ -224,7 +224,7 @@ void ThreadContextListener::event_contextGetLogin(void*data) void ThreadContextListener::event_contextGetSavedLogin(void*data) { - QMutexLocker lock(&m_WaitMutex); + TQMutexLocker lock(&m_WaitMutex); if (!data) { m_Data->m_trustpromptWait.wakeAll(); return; @@ -236,7 +236,7 @@ void ThreadContextListener::event_contextGetSavedLogin(void*data) void ThreadContextListener::event_contextGetLogMessage(void * data) { - QMutexLocker lock(&m_WaitMutex); + TQMutexLocker lock(&m_WaitMutex); if (!data) { m_Data->m_trustpromptWait.wakeAll(); return; @@ -249,7 +249,7 @@ void ThreadContextListener::event_contextGetLogMessage(void * data) void ThreadContextListener::event_contextSslClientCertPrompt(void*data) { - QMutexLocker lock(&m_WaitMutex); + TQMutexLocker lock(&m_WaitMutex); if (!data) { m_Data->m_trustpromptWait.wakeAll(); return; @@ -261,7 +261,7 @@ void ThreadContextListener::event_contextSslClientCertPrompt(void*data) void ThreadContextListener::event_contextSslClientCertPwPrompt(void*data) { - QMutexLocker lock(&m_WaitMutex); + TQMutexLocker lock(&m_WaitMutex); if (!data) { m_Data->m_trustpromptWait.wakeAll(); return; @@ -273,7 +273,7 @@ void ThreadContextListener::event_contextSslClientCertPwPrompt(void*data) void ThreadContextListener::event_contextSslServerTrustPrompt(void*data) { - QMutexLocker lock(&m_WaitMutex); + TQMutexLocker lock(&m_WaitMutex); /* * m_SslTrustAnswer is made threadsafe due the m_trustpromptWait - the calling thread waits until wakeAll is called! */ @@ -297,7 +297,7 @@ void ThreadContextListener::event_contextNotify(void*data) delete _notify; } -void ThreadContextListener::customEvent(QCustomEvent*ev) +void ThreadContextListener::customEvent(TQCustomEvent*ev) { if (ev->type()==EVENT_THREAD_SSL_TRUST_PROMPT) { event_contextSslServerTrustPrompt(ev->data()); diff --git a/src/svnfrontend/tcontextlistener.h b/src/svnfrontend/tcontextlistener.h index 92d69b4..df01d20 100644 --- a/src/svnfrontend/tcontextlistener.h +++ b/src/svnfrontend/tcontextlistener.h @@ -24,9 +24,9 @@ #include "ccontextlistener.h" -#include -#include -#include +#include +#include +#include class ThreadContextListenerData; @@ -36,23 +36,24 @@ class ThreadContextListenerData; class ThreadContextListener : public CContextListener { Q_OBJECT + TQ_OBJECT public: - ThreadContextListener(QObject* parent, const char* name=0); + ThreadContextListener(TQObject* tqparent, const char* name=0); virtual ~ThreadContextListener(); - virtual bool contextGetLogin(const QString& realm, QString& username, QString& password, bool& maySave); - virtual bool contextGetSavedLogin(const QString & realm,QString & username,QString & password); + virtual bool contextGetLogin(const TQString& realm, TQString& username, TQString& password, bool& maySave); + virtual bool contextGetSavedLogin(const TQString & realm,TQString & username,TQString & password); - virtual bool contextGetLogMessage(QString& msg,const svn::CommitItemList&); - virtual bool contextSslClientCertPrompt(QString& certFile); - virtual bool contextSslClientCertPwPrompt(QString& password, const QString& realm, bool& maySave); + virtual bool contextGetLogMessage(TQString& msg,const svn::CommitItemList&); + virtual bool contextSslClientCertPrompt(TQString& certFile); + virtual bool contextSslClientCertPwPrompt(TQString& password, const TQString& realm, bool& maySave); virtual svn::ContextListener::SslServerTrustAnswer contextSslServerTrustPrompt(const SslServerTrustData& data, apr_uint32_t& acceptedFailures); - virtual void contextNotify(const QString&aMsg); + virtual void contextNotify(const TQString&aMsg); virtual void sendTick(); virtual void contextProgress(long long int current, long long int max); - static QMutex*callbackMutex(); + static TQMutex*callbackMutex(); protected: virtual void event_contextGetLogin(void*_data); @@ -62,10 +63,10 @@ protected: virtual void event_contextSslClientCertPwPrompt(void*data); virtual void event_contextSslServerTrustPrompt(void* data); virtual void event_contextNotify(void*data); - virtual void customEvent(QCustomEvent*); + virtual void customEvent(TQCustomEvent*); /* stores all internals */ - QMutex m_WaitMutex; + TQMutex m_WaitMutex; ThreadContextListenerData*m_Data; }; diff --git a/src/svnfrontend/threadcontextlistenerdata.h b/src/svnfrontend/threadcontextlistenerdata.h index b225161..82726a7 100644 --- a/src/svnfrontend/threadcontextlistenerdata.h +++ b/src/svnfrontend/threadcontextlistenerdata.h @@ -22,8 +22,8 @@ #include "src/svnqt/context_listener.hpp" -#include -#include +#include +#include /** @author Rajko Albrecht @@ -38,7 +38,7 @@ public: bool noProgress; /* only one callback at time */ - QWaitCondition m_trustpromptWait; + TQWaitCondition m_trustpromptWait; /* safed due condition above */ /* this variables are for the event handling across threads */ @@ -52,13 +52,13 @@ public: /* login into server */ struct slogin_data { - QString user,password,realm; + TQString user,password,realm; bool maysave,ok; }; struct slog_message { - QString msg; + TQString msg; bool ok; const svn::CommitItemList*_items; slog_message(){_items = 0;} @@ -66,19 +66,19 @@ public: struct scert_pw { - QString password,realm; + TQString password,realm; bool ok,maysave; }; struct scert_file { - QString certfile; + TQString certfile; bool ok; }; struct snotify { - QString msg; + TQString msg; }; }; -- cgit v1.2.1