summaryrefslogtreecommitdiffstats
path: root/src/svnfrontend/tdesvnfilelist.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/svnfrontend/tdesvnfilelist.cpp')
-rw-r--r--src/svnfrontend/tdesvnfilelist.cpp72
1 files changed, 36 insertions, 36 deletions
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index 131ea18..23563fd 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -65,7 +65,7 @@
#include <tqpainter.h>
#include <tqstyle.h>
#include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqtooltip.h>
#include <tqregexp.h>
@@ -235,7 +235,7 @@ tdesvnfilelist::tdesvnfilelist(KActionCollection*aCollect,TQWidget *parent, cons
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(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)));
connect(m_SvnWrapper,TQT_SIGNAL(sigThreadsChanged()),this,TQT_SLOT(enableActions()));
m_pList->connectDirTimer(TQT_TQOBJECT(this));
@@ -655,7 +655,7 @@ bool tdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _parent)
}
// 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->maketqStatus(what,dlist,m_pList->m_remoteRevision) ) {
+ if (!m_SvnWrapper->makeStatus(what,dlist,m_pList->m_remoteRevision) ) {
kdDebug() << "unable makeStatus" <<endl;
return false;
}
@@ -682,7 +682,7 @@ bool tdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _parent)
// current item is not versioned
if (!(*it)->isVersioned() && !filterOut((*it))) {
- // if empty, we may want to create a default svn::tqStatus for each folder inside this _parent
+ // if empty, we may want to create a default svn::Status for each folder inside this _parent
// iterate over TQDir and create new filelistviewitem
checkUnversionedDirs(_parent);
}
@@ -706,7 +706,7 @@ bool tdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _parent)
if (ownupdates) {
kdDebug()<<"Enable update"<<endl;
viewport()->setUpdatesEnabled(true);
- viewport()->tqrepaint();
+ viewport()->repaint();
}
return true;
}
@@ -723,7 +723,7 @@ void tdesvnfilelist::insertDirs(FileListViewItem * _parent,svn::StatusEntries&dl
for (it = dlist.begin();it!=dlist.end();++it) {
/* if (_t.elapsed()>300) {
viewport()->setUpdatesEnabled(true);
- viewport()->tqrepaint();
+ viewport()->repaint();
viewport()->setUpdatesEnabled(false);
_t.restart();
}*/
@@ -756,7 +756,7 @@ void tdesvnfilelist::insertDirs(FileListViewItem * _parent,svn::StatusEntries&dl
void tdesvnfilelist::slotDirAdded(const TQString&newdir,FileListViewItem*k)
{
if (k) {
- k->refreshtqStatus();
+ k->refreshStatus();
}
if (!isWorkingCopy()) {
if (k) {
@@ -779,7 +779,7 @@ void tdesvnfilelist::slotDirAdded(const TQString&newdir,FileListViewItem*k)
}
svn::StatusPtr stat;
try {
- stat = m_SvnWrapper->svnclient()->singletqStatus(newdir);
+ stat = m_SvnWrapper->svnclient()->singleStatus(newdir);
} catch (const svn::ClientException&e) {
m_LastException = e.msg();
kdDebug()<<"Catched on singlestatus"<< endl;
@@ -1051,7 +1051,7 @@ void tdesvnfilelist::slotClientException(const TQString&what)
void tdesvnfilelist::slotNotifyMessage(const TQString&what)
{
emit sigLogMessage(what);
- kapp->tqprocessEvents(20);
+ kapp->processEvents(20);
}
void tdesvnfilelist::slotChangeToRepository()
@@ -1103,7 +1103,7 @@ void tdesvnfilelist::slotItemDoubleClicked(TQListViewItem*item)
}
} else {
if ( KRun::runCommand(feditor + " " + fki->kdeName(rev).prettyURL()) <= 0) {
- KMessageBox::error(this,i18n("Failed: %1 %2").tqarg(feditor).tqarg(fki->fullName()));
+ KMessageBox::error(this,i18n("Failed: %1 %2").arg(feditor).arg(fki->fullName()));
}
}
}
@@ -1115,7 +1115,7 @@ void tdesvnfilelist::slotCleanupAction()
if (!which) which = static_cast<FileListViewItem*>(firstChild());
if (!which||!which->isDir()) return;
if (m_SvnWrapper->makeCleanup(which->fullName())) {
- which->refreshtqStatus(true);
+ which->refreshStatus(true);
}
}
@@ -1126,7 +1126,7 @@ void tdesvnfilelist::slotResolved()
if (!which) which = static_cast<FileListViewItem*>(firstChild());
if (!which) return;
m_SvnWrapper->slotResolved(which->fullName());
- which->refreshtqStatus(true);
+ which->refreshStatus(true);
slotRescanIcons(false);
}
@@ -1273,7 +1273,7 @@ void tdesvnfilelist::refreshCurrentTree()
if (item->fullName()==baseUri()) {
if (!refreshItem(item)) {
setUpdatesEnabled(true);
- viewport()->tqrepaint();
+ viewport()->repaint();
return;
} else {
refreshRecursive(item);
@@ -1286,7 +1286,7 @@ void tdesvnfilelist::refreshCurrentTree()
}
kdDebug()<<"Refresh time: "<<t.elapsed()<<" ms"<<endl;
setUpdatesEnabled(true);
- viewport()->tqrepaint();
+ viewport()->repaint();
TQTimer::singleShot(1,this,TQT_SLOT(readSupportData()));
//m_pList->startScan();
}
@@ -1301,7 +1301,7 @@ void tdesvnfilelist::refreshCurrent(SvnItem*cur)
setUpdatesEnabled(false);
refreshRecursive(cur->fItem());
setUpdatesEnabled(true);
- viewport()->tqrepaint();
+ viewport()->repaint();
}
bool tdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down)
@@ -1327,7 +1327,7 @@ bool tdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down)
TQString what = (_parent!=0?_parent->fullName():baseUri());
svn::StatusEntries dlist;
- if (!m_SvnWrapper->maketqStatus(what,dlist,m_pList->m_remoteRevision)) {
+ if (!m_SvnWrapper->makeStatus(what,dlist,m_pList->m_remoteRevision)) {
kdDebug()<<"Fehler bei makestatus fuer "<<what <<endl;
return false;
}
@@ -1351,7 +1351,7 @@ bool tdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down)
++clistIter;
if (k->fullName()==(*it)->path()) {
currentSync.removeRef(k);
- k->updatetqStatus(*it);
+ k->updateStatus(*it);
if (filterOut(k)) {
dispchanged=true;
delete k;
@@ -1657,7 +1657,7 @@ void tdesvnfilelist::contentsDragMoveEvent( TQDragMoveEvent* event)
if (tmpRect!=m_pList->mOldDropHighlighter) {
cleanHighLighter();
m_pList->mOldDropHighlighter=tmpRect;
- viewport()->tqrepaint(tmpRect);
+ viewport()->repaint(tmpRect);
kapp->processEvents();
}
}
@@ -1673,7 +1673,7 @@ void tdesvnfilelist::viewportPaintEvent(TQPaintEvent *ev)
KListView::viewportPaintEvent(ev);
if (m_pList->mOldDropHighlighter.isValid() && ev->rect().intersects(m_pList->mOldDropHighlighter)) {
TQPainter painter(viewport());
- tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, tqcolorGroup(),
+ tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, colorGroup(),
TQStyle::Style_FocusAtBorder);
}
}
@@ -1683,7 +1683,7 @@ void tdesvnfilelist::cleanHighLighter()
if (m_pList->mOldDropHighlighter.isValid()) {
TQRect rect=m_pList->mOldDropHighlighter;
m_pList->mOldDropHighlighter=TQRect();
- viewport()->tqrepaint(rect, true);
+ viewport()->repaint(rect, true);
}
}
@@ -2038,7 +2038,7 @@ void tdesvnfilelist::dispDummy()
TQLabel dummy(this,0,WStyle_NoBorder|WShowModal);
TQSize csize = size();
dummy.setText(i18n("Please wait until job is finished"));
- dummy.resize(dummy.tqminimumSizeHint());
+ dummy.resize(dummy.minimumSizeHint());
if (dummy.width()<=width()&&dummy.height()<=height()) {
dummy.move(csize.width()/2-dummy.width()/2,csize.height()/2-dummy.height()/2);
}
@@ -2307,7 +2307,7 @@ void tdesvnfilelist::slotMkBaseDirs()
targets.append(parentDir+"/trunk");
targets.append(parentDir+"/branches");
targets.append(parentDir+"/tags");
- TQString msg = i18n("Automatic generated base tqlayout by tdesvn");
+ TQString msg = i18n("Automatic generated base layout by tdesvn");
isopen = m_SvnWrapper->makeMkdir(targets,msg);
if (isopen) {
slotDirAdded(targets[0],0);
@@ -2401,9 +2401,9 @@ bool tdesvnfilelist::refreshItem(FileListViewItem*item)
return false;
}
try {
- item->setStat(svnclient()->singletqStatus(item->fullName(),false,m_pList->m_remoteRevision));
+ item->setStat(svnclient()->singleStatus(item->fullName(),false,m_pList->m_remoteRevision));
} catch (const svn::ClientException&e) {
- item->setStat(new svn::tqStatus());
+ item->setStat(new svn::Status());
return false;
}
return true;
@@ -2600,7 +2600,7 @@ void tdesvnfilelist::_dirwatchTimeout()
m_pList->dirItems.clear();
viewport()->setUpdatesEnabled(true);
if (repaintit) {
-// viewport()->tqrepaint();
+// viewport()->repaint();
}
}
@@ -2683,7 +2683,7 @@ void tdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e )
FileListViewItem*item = isExecuteArea( vp ) ? static_cast<FileListViewItem*>(itemAt( vp )) : 0L;
if (item) {
- vp.setY( tqitemRect( item ).y() );
+ vp.setY( itemRect( item ).y() );
TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) );
m_pList->m_fileTip->setItem( static_cast<SvnItem*>(item), rect, item->pixmap(0));
m_pList->m_fileTip->setPreview(KGlobalSettings::showFilePreview(item->fullName())/*&&isWorkingCopy()*/
@@ -2758,7 +2758,7 @@ void tdesvnfilelist::slotSettingsChanged()
if (m_pList->reReadSettings()) {
refreshCurrentTree();
} else {
- viewport()->tqrepaint();
+ viewport()->repaint();
}
enableActions();
sort();
@@ -2783,7 +2783,7 @@ void tdesvnfilelist::slotRelocate()
path = k->fullName();
fromUrl = k->Url();
CheckoutInfo_impl*ptr;
- KDialogBase * dlg = createDialog(&ptr,i18n("Relocate path %1").tqarg(path),true,"relocate_dlg");
+ KDialogBase * dlg = createDialog(&ptr,i18n("Relocate path %1").arg(path),true,"relocate_dlg");
if (dlg) {
ptr->setStartUrl(fromUrl);
ptr->disableAppend(true);
@@ -2839,9 +2839,9 @@ void tdesvnfilelist::checkUnversionedDirs( FileListViewItem * _parent )
// else
// entry.kind = svn_node_file;
//
-// svn::tqStatus stat(fi->fileName(), &wc_stat);
+// svn::Status stat(fi->fileName(), &wc_stat);
- svn::StatusPtr stat(new svn::tqStatus(fi->absFilePath()));
+ svn::StatusPtr stat(new svn::Status(fi->absFilePath()));
// start copying insertDirs
FileListViewItem * item;
@@ -2886,13 +2886,13 @@ void tdesvnfilelist::rescanIconsRec(FileListViewItem*startAt,bool checkNewer,boo
if (!_s) {
return;
}
- svn::SharedPointer<svn::tqStatus> d;
+ svn::SharedPointer<svn::Status> d;
while (_s) {
//_s->makePixmap();
if (!no_update) {
if (m_SvnWrapper->getUpdated(_s->stat()->path(),d) && d) {
- _s->updatetqStatus(d);
+ _s->updateStatus(d);
} else {
_s->update();
}
@@ -3077,7 +3077,7 @@ void tdesvnfilelist::slotUnfoldTree()
}
if (t.elapsed()>=200) {
sdlg.slotTick();
- kapp->tqprocessEvents(20);
+ kapp->processEvents(20);
t.restart();
}
((FileListViewItem*)item)->setOpenNoBlock(true);
@@ -3087,8 +3087,8 @@ void tdesvnfilelist::slotUnfoldTree()
}
setFocus();
setUpdatesEnabled(true);
- viewport()->tqrepaint();
- tqrepaint();
+ viewport()->repaint();
+ repaint();
m_SvnWrapper->slotCancel(false);
}
@@ -3132,7 +3132,7 @@ void tdesvnfilelist::slotChangeProperties(const svn::PropertiesMap&pm,const TQVa
FileListViewItem* which = singleSelected();
kdDebug()<<(which?which->fullName():"nix") << " -> " << path<<endl;
if (which && which->fullName()==path) {
- which->refreshtqStatus();
+ which->refreshStatus();
refreshCurrent(which);
_propListTimeout();
}