summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/commandline_part.cpp4
-rw-r--r--src/kiosvn/kiosvn.cpp8
-rw-r--r--src/ksvnwidgets/authdialogimpl.cpp2
-rw-r--r--src/ksvnwidgets/authdlg.ui2
-rw-r--r--src/ksvnwidgets/depthform.ui2
-rw-r--r--src/ksvnwidgets/depthselector.cpp8
-rw-r--r--src/ksvnwidgets/logmsg_impl.cpp6
-rw-r--r--src/ksvnwidgets/revertform.ui4
-rw-r--r--src/ksvnwidgets/revertform_impl.cpp2
-rw-r--r--src/settings/cmdexecsettings.ui2
-rw-r--r--src/settings/diffmergesettings.ui2
-rw-r--r--src/settings/dispcolor_settings.ui2
-rw-r--r--src/settings/display_settings.ui2
-rw-r--r--src/settings/revisiontree_settings.ui2
-rw-r--r--src/settings/subversion_settings.ui2
-rw-r--r--src/svnfrontend/blamedisplay_impl.cpp4
-rw-r--r--src/svnfrontend/cacheentry.h2
-rw-r--r--src/svnfrontend/commandexec.cpp2
-rw-r--r--src/svnfrontend/copymoveview_impl.cpp2
-rw-r--r--src/svnfrontend/editpropsdlg.ui8
-rw-r--r--src/svnfrontend/filelistviewitem.cpp8
-rw-r--r--src/svnfrontend/filelistviewitem.h4
-rw-r--r--src/svnfrontend/fronthelpers/checkoutinfo.ui2
-rw-r--r--src/svnfrontend/fronthelpers/cursorstack.h2
-rw-r--r--src/svnfrontend/fronthelpers/rangeinput_impl.cpp8
-rw-r--r--src/svnfrontend/graphtree/revtreewidget.cpp6
-rw-r--r--src/svnfrontend/itemdisplay.cpp4
-rw-r--r--src/svnfrontend/itemdisplay.h2
-rw-r--r--src/svnfrontend/merge_dlg.ui2
-rw-r--r--src/svnfrontend/mergedlg_impl.cpp4
-rw-r--r--src/svnfrontend/stopdlg.cpp2
-rw-r--r--src/svnfrontend/svnactions.cpp66
-rw-r--r--src/svnfrontend/svnactions.h10
-rw-r--r--src/svnfrontend/svnfiletip.cpp4
-rw-r--r--src/svnfrontend/svnitem.cpp34
-rw-r--r--src/svnfrontend/svnitem.h2
-rw-r--r--src/svnfrontend/svnlogdlg.ui4
-rw-r--r--src/svnfrontend/svnlogdlgimp.cpp12
-rw-r--r--src/svnfrontend/tdesvnfilelist.cpp42
-rw-r--r--src/svnfrontend/tdesvnfilelist.h2
-rw-r--r--src/svnqt/cache/sqlite3/qsql_sqlite3.cpp10
-rw-r--r--src/svnqt/client.hpp6
-rw-r--r--src/svnqt/client_impl.hpp6
-rw-r--r--src/svnqt/client_status.cpp36
-rw-r--r--src/svnqt/dirent.cpp2
-rw-r--r--src/svnqt/log_entry.cpp8
-rw-r--r--src/svnqt/path.cpp2
-rw-r--r--src/svnqt/status.cpp54
-rw-r--r--src/svnqt/status.hpp30
-rw-r--r--src/svnqt/svnqttypes.hpp4
-rw-r--r--src/svnqt/url.cpp8
-rw-r--r--src/svnqt/wc.cpp2
-rw-r--r--src/tdesvn.cpp4
-rw-r--r--src/tdesvnview.cpp8
-rw-r--r--src/tdesvnview.h2
-rw-r--r--src/urldlg.cpp12
56 files changed, 241 insertions, 241 deletions
diff --git a/src/commandline_part.cpp b/src/commandline_part.cpp
index 3037cd1..f26613b 100644
--- a/src/commandline_part.cpp
+++ b/src/commandline_part.cpp
@@ -30,10 +30,10 @@ commandline_part::commandline_part(TQObject *parent, const char *name,KCmdLineAr
KInstance * inst = tdesvnPartFactory::instance();
KGlobal::locale()->insertCatalogue(inst->instanceName());
KGlobal::dirs()->addResourceType( inst->instanceName() + "data",
- KStandardDirs::kde_default("data")+ TQString::tqfromLatin1( inst->instanceName() ) + '/' );
+ KStandardDirs::kde_default("data")+ TQString::fromLatin1( inst->instanceName() ) + '/' );
- m_pCPart = new CommandExec(this,TQString(name?TQString(name)+TQString("_exec"):TQString::tqfromLatin1("command_executer")).ascii(),args);
+ m_pCPart = new CommandExec(this,TQString(name?TQString(name)+TQString("_exec"):TQString::fromLatin1("command_executer")).ascii(),args);
}
commandline_part::~commandline_part()
diff --git a/src/kiosvn/kiosvn.cpp b/src/kiosvn/kiosvn.cpp
index 0773d6d..159a05d 100644
--- a/src/kiosvn/kiosvn.cpp
+++ b/src/kiosvn/kiosvn.cpp
@@ -671,13 +671,13 @@ void kio_svnProtocol::status(const KURL&wc,bool cR,bool rec)
}
//TQDataStream stream(params, IO_WriteOnly);
setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"path",dlist[j]->path());
- setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"text",TQString::number(dlist[j]->texttqStatus()));
+ setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"text",TQString::number(dlist[j]->textStatus()));
setMetaData(TQString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "prop",
- TQString::number(dlist[j]->proptqStatus()));
+ TQString::number(dlist[j]->propStatus()));
setMetaData(TQString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "reptxt",
- TQString::number(dlist[j]->reposTexttqStatus()));
+ TQString::number(dlist[j]->reposTextStatus()));
setMetaData(TQString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "repprop",
- TQString::number(dlist[j]->reposProptqStatus()));
+ TQString::number(dlist[j]->reposPropStatus()));
setMetaData(TQString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "rev",
TQString::number(dlist[j]->entry().cmtRev()));
m_pData->m_Listener.incCounter();
diff --git a/src/ksvnwidgets/authdialogimpl.cpp b/src/ksvnwidgets/authdialogimpl.cpp
index f445e78..c862b38 100644
--- a/src/ksvnwidgets/authdialogimpl.cpp
+++ b/src/ksvnwidgets/authdialogimpl.cpp
@@ -38,7 +38,7 @@ AuthDialogImpl::AuthDialogImpl(const TQString & realm,const TQString&user,TQWidg
.tqarg((Kdesvnsettings::passwords_in_wallet()?i18n("into KDE Wallet"):i18n("into subversions simple storage"))));
if (!realm.isEmpty()) {
m_RealmLabel->setText(m_RealmLabel->text()+" "+realm);
- resize( TQSize(334, 158).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(334, 158).expandedTo(minimumSizeHint()) );
}
}
diff --git a/src/ksvnwidgets/authdlg.ui b/src/ksvnwidgets/authdlg.ui
index b3facca..d4ae7d2 100644
--- a/src/ksvnwidgets/authdlg.ui
+++ b/src/ksvnwidgets/authdlg.ui
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>90</width>
<height>20</height>
diff --git a/src/ksvnwidgets/depthform.ui b/src/ksvnwidgets/depthform.ui
index bb738b1..f147cbd 100644
--- a/src/ksvnwidgets/depthform.ui
+++ b/src/ksvnwidgets/depthform.ui
@@ -80,7 +80,7 @@ Equivalent to the pre-1.5 default update behavior.
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/src/ksvnwidgets/depthselector.cpp b/src/ksvnwidgets/depthselector.cpp
index 6e9bb74..314613d 100644
--- a/src/ksvnwidgets/depthselector.cpp
+++ b/src/ksvnwidgets/depthselector.cpp
@@ -42,11 +42,11 @@ DepthSelector::DepthSelector(TQWidget *parent, const char *name)
m_recurse->setChecked( TRUE );
m_recurse->setText(i18n( "Recursive" ));
DepthFormLayout->addWidget( m_recurse );
- m_recurse->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
+ m_recurse->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
DepthFormLayout->addItem(m_leftspacer);
}
DepthFormLayout->setMargin(0);
- setMinimumSize(tqminimumSizeHint());
+ setMinimumSize(minimumSizeHint());
adjustSize();
}
@@ -58,9 +58,9 @@ void DepthSelector::addItemWidget(TQWidget*aWidget)
DepthFormLayout->removeItem(m_leftspacer);
aWidget->reparent(this,tqgeometry().topLeft());
DepthFormLayout->addWidget(aWidget);
- aWidget->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
+ aWidget->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
DepthFormLayout->addItem(m_leftspacer);
- setMinimumSize(tqminimumSizeHint());
+ setMinimumSize(minimumSizeHint());
}
/*!
diff --git a/src/ksvnwidgets/logmsg_impl.cpp b/src/ksvnwidgets/logmsg_impl.cpp
index 037a66f..d8d51b2 100644
--- a/src/ksvnwidgets/logmsg_impl.cpp
+++ b/src/ksvnwidgets/logmsg_impl.cpp
@@ -451,9 +451,9 @@ void Logmsg_impl::addItemWidget(TQWidget*aWidget)
m_DepthSelector->addItemWidget(aWidget);
/* aWidget->reparent(this,tqgeometry().topLeft());
m_ItemsLayout->addWidget(aWidget);
- kdDebug()<<"SizeHint: "<<aWidget->tqminimumSizeHint()<< endl;
- aWidget->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
- setMinimumHeight(tqminimumSizeHint().height());*/
+ kdDebug()<<"SizeHint: "<<aWidget->minimumSizeHint()<< endl;
+ aWidget->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
+ setMinimumHeight(minimumSizeHint().height());*/
}
Logmsg_impl::logActionEntries Logmsg_impl::selectedEntries()
diff --git a/src/ksvnwidgets/revertform.ui b/src/ksvnwidgets/revertform.ui
index 1f413dc..dacca01 100644
--- a/src/ksvnwidgets/revertform.ui
+++ b/src/ksvnwidgets/revertform.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -50,7 +50,7 @@
<property name="name">
<cstring>m_DepthSelect</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
diff --git a/src/ksvnwidgets/revertform_impl.cpp b/src/ksvnwidgets/revertform_impl.cpp
index 91ad876..8b18508 100644
--- a/src/ksvnwidgets/revertform_impl.cpp
+++ b/src/ksvnwidgets/revertform_impl.cpp
@@ -29,7 +29,7 @@
RevertFormImpl::RevertFormImpl(TQWidget*parent,const char*name)
:RevertForm(parent,name)
{
- setMinimumSize(tqminimumSizeHint());
+ setMinimumSize(minimumSizeHint());
}
/*!
diff --git a/src/settings/cmdexecsettings.ui b/src/settings/cmdexecsettings.ui
index 6e73492..bf15c3f 100644
--- a/src/settings/cmdexecsettings.ui
+++ b/src/settings/cmdexecsettings.ui
@@ -118,7 +118,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/src/settings/diffmergesettings.ui b/src/settings/diffmergesettings.ui
index 106fb72..304e639 100644
--- a/src/settings/diffmergesettings.ui
+++ b/src/settings/diffmergesettings.ui
@@ -220,7 +220,7 @@ When %1 and %2 is given, tdesvn let this display make the diff. For that it it m
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/src/settings/dispcolor_settings.ui b/src/settings/dispcolor_settings.ui
index a395cac..48cb3e3 100644
--- a/src/settings/dispcolor_settings.ui
+++ b/src/settings/dispcolor_settings.ui
@@ -224,7 +224,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/src/settings/display_settings.ui b/src/settings/display_settings.ui
index b06c50b..11847f8 100644
--- a/src/settings/display_settings.ui
+++ b/src/settings/display_settings.ui
@@ -205,7 +205,7 @@ When kde-default is wanted for opening on double click, enter &amp;quot;default&
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/src/settings/revisiontree_settings.ui b/src/settings/revisiontree_settings.ui
index 7373eea..a5f194c 100644
--- a/src/settings/revisiontree_settings.ui
+++ b/src/settings/revisiontree_settings.ui
@@ -219,7 +219,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/src/settings/subversion_settings.ui b/src/settings/subversion_settings.ui
index 6e40fcf..d3caac1 100644
--- a/src/settings/subversion_settings.ui
+++ b/src/settings/subversion_settings.ui
@@ -230,7 +230,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp
index 06727a5..63913b5 100644
--- a/src/svnfrontend/blamedisplay_impl.cpp
+++ b/src/svnfrontend/blamedisplay_impl.cpp
@@ -202,7 +202,7 @@ void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum
if (Kdesvnsettings::self()->colored_blame()) {
_bgColor = cb->rev2color(m_Content.revision());
} else {
- _bgColor = listView()->viewport()->tqcolorGroup().base();
+ _bgColor = listView()->viewport()->colorGroup().base();
}
}
@@ -344,7 +344,7 @@ const TQColor BlameDisplay_impl::rev2color(svn_revnum_t r )const
{
return m_Data->m_shadingMap[r];
} else {
- return m_BlameList->viewport()->tqcolorGroup().base();
+ return m_BlameList->viewport()->colorGroup().base();
}
}
diff --git a/src/svnfrontend/cacheentry.h b/src/svnfrontend/cacheentry.h
index 1b36a95..fd9ae64 100644
--- a/src/svnfrontend/cacheentry.h
+++ b/src/svnfrontend/cacheentry.h
@@ -569,7 +569,7 @@ public:
ValidRemoteOnly():m_List(){}
void operator()(const std::pair<TQString,helpers::ptrEntry>&_data)
{
- if(_data.second.isValid() && _data.second.content()->validRepostqStatus()&&!_data.second.content()->validLocaltqStatus()) {
+ if(_data.second.isValid() && _data.second.content()->validReposStatus()&&!_data.second.content()->validLocalStatus()) {
m_List.push_back(_data.second.content());
}
}
diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp
index 431125c..18d645e 100644
--- a/src/svnfrontend/commandexec.cpp
+++ b/src/svnfrontend/commandexec.cpp
@@ -606,7 +606,7 @@ bool CommandExec::askRevision()
TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget();
Rangeinput_impl*rdlg;
rdlg = new Rangeinput_impl(Dialog1Layout);
- dlg.resize( TQSize(120,60).expandedTo(dlg.tqminimumSizeHint()));
+ dlg.resize( TQSize(120,60).expandedTo(dlg.minimumSizeHint()));
rdlg->setStartOnly(m_pCPart->single_revision);
if (dlg.exec()==TQDialog::Accepted) {
Rangeinput_impl::revision_range range = rdlg->getRange();
diff --git a/src/svnfrontend/copymoveview_impl.cpp b/src/svnfrontend/copymoveview_impl.cpp
index 98e3d60..f635cf8 100644
--- a/src/svnfrontend/copymoveview_impl.cpp
+++ b/src/svnfrontend/copymoveview_impl.cpp
@@ -88,7 +88,7 @@ TQString CopyMoveView_impl::getMoveCopyTo(bool*ok,bool*force,bool move,
TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget();
CopyMoveView_impl*ptr=new CopyMoveView_impl(base,old,(move),Dialog1Layout);
TQString nName = TQString();
- dlg.resize( TQSize(500,160).expandedTo(dlg.tqminimumSizeHint()) );
+ dlg.resize( TQSize(500,160).expandedTo(dlg.minimumSizeHint()) );
if (dlg.exec()!=TQDialog::Accepted) {
if (ok) *ok = false;
} else {
diff --git a/src/svnfrontend/editpropsdlg.ui b/src/svnfrontend/editpropsdlg.ui
index c0bab16..5d8535e 100644
--- a/src/svnfrontend/editpropsdlg.ui
+++ b/src/svnfrontend/editpropsdlg.ui
@@ -37,7 +37,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>107</width>
<height>20</height>
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>60</height>
@@ -154,7 +154,7 @@
<property name="name">
<cstring>helpButton</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>36</width>
<height>36</height>
@@ -185,7 +185,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp
index a285590..da474ae 100644
--- a/src/svnfrontend/filelistviewitem.cpp
+++ b/src/svnfrontend/filelistviewitem.cpp
@@ -118,7 +118,7 @@ void FileListViewItem::setStat(const svn::StatusPtr&stat)
init();
}
-void FileListViewItem::refreshtqStatus(bool childs,TQPtrList<SvnItem>*exclude,bool depsonly)
+void FileListViewItem::refreshStatus(bool childs,TQPtrList<SvnItem>*exclude,bool depsonly)
{
FileListViewItem*it;
@@ -133,13 +133,13 @@ void FileListViewItem::refreshtqStatus(bool childs,TQPtrList<SvnItem>*exclude,bo
it = static_cast<FileListViewItem*>(parent());
if (!childs) {
if (it && (!exclude || exclude->find(it)==-1)) {
- it->refreshtqStatus(false,exclude);
+ it->refreshStatus(false,exclude);
}
} else if (firstChild()){
it = static_cast<FileListViewItem*>(firstChild());
while (it) {
if (!exclude || exclude->find(it)==-1) {
- it->refreshtqStatus(true,exclude);
+ it->refreshStatus(true,exclude);
}
it = static_cast<FileListViewItem*>(it->nextSibling());
}
@@ -228,7 +228,7 @@ void FileListViewItem::removeChilds()
}
}
-void FileListViewItem::updatetqStatus(const svn::StatusPtr&s)
+void FileListViewItem::updateStatus(const svn::StatusPtr&s)
{
setStat(s);
}
diff --git a/src/svnfrontend/filelistviewitem.h b/src/svnfrontend/filelistviewitem.h
index cc82456..6dab6e9 100644
--- a/src/svnfrontend/filelistviewitem.h
+++ b/src/svnfrontend/filelistviewitem.h
@@ -44,8 +44,8 @@ public:
virtual ~FileListViewItem();
virtual int compare( TQListViewItem* i, int col, bool ascending ) const;
- virtual void updatetqStatus(const svn::StatusPtr&s);
- virtual void refreshtqStatus(bool childs=false,TQPtrList<SvnItem> *exclude = 0,bool depsonly=false);
+ virtual void updateStatus(const svn::StatusPtr&s);
+ virtual void refreshStatus(bool childs=false,TQPtrList<SvnItem> *exclude = 0,bool depsonly=false);
#if 0
virtual void refreshMe();
diff --git a/src/svnfrontend/fronthelpers/checkoutinfo.ui b/src/svnfrontend/fronthelpers/checkoutinfo.ui
index 048711e..8644974 100644
--- a/src/svnfrontend/fronthelpers/checkoutinfo.ui
+++ b/src/svnfrontend/fronthelpers/checkoutinfo.ui
@@ -144,7 +144,7 @@
<property name="name">
<cstring>m_DepthSelector</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>20</width>
<height>20</height>
diff --git a/src/svnfrontend/fronthelpers/cursorstack.h b/src/svnfrontend/fronthelpers/cursorstack.h
index 4daf061..cadad9b 100644
--- a/src/svnfrontend/fronthelpers/cursorstack.h
+++ b/src/svnfrontend/fronthelpers/cursorstack.h
@@ -39,7 +39,7 @@ public:
* Create instance and changes the application cursor to \a c
* \param c cursortype to set.
*/
- CursorStack(TQt::tqCursorShape c = TQt::WaitCursor)
+ CursorStack(TQt::CursorShape c = TQt::WaitCursor)
{
KApplication::setOverrideCursor(TQCursor(c));
}
diff --git a/src/svnfrontend/fronthelpers/rangeinput_impl.cpp b/src/svnfrontend/fronthelpers/rangeinput_impl.cpp
index e21eaca..7ad1d37 100644
--- a/src/svnfrontend/fronthelpers/rangeinput_impl.cpp
+++ b/src/svnfrontend/fronthelpers/rangeinput_impl.cpp
@@ -36,8 +36,8 @@ Rangeinput_impl::Rangeinput_impl(TQWidget *parent, const char *name)
m_endRevInput->setRange(0,INT_MAX,1,false);
m_startRevInput->setValue(1);
m_endRevInput->setValue(1);
- m_startDateInput->setDateTime(TQDateTime::tqcurrentDateTime ());
- m_stopDateInput->setDateTime(TQDateTime::tqcurrentDateTime ());
+ m_startDateInput->setDateTime(TQDateTime::currentDateTime ());
+ m_stopDateInput->setDateTime(TQDateTime::currentDateTime ());
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(tqminimumSizeHint());
- resize( TQSize(397, 272).expandedTo(tqminimumSizeHint()) );
+ setMinimumSize(minimumSizeHint());
+ resize( TQSize(397, 272).expandedTo(minimumSizeHint()) );
}
#include "rangeinput_impl.moc"
diff --git a/src/svnfrontend/graphtree/revtreewidget.cpp b/src/svnfrontend/graphtree/revtreewidget.cpp
index 2652e3c..46ae7fa 100644
--- a/src/svnfrontend/graphtree/revtreewidget.cpp
+++ b/src/svnfrontend/graphtree/revtreewidget.cpp
@@ -44,7 +44,7 @@ RevTreeWidget::RevTreeWidget(TQObject*lt,svn::Client*cl, TQWidget* parent, const
m_Splitter->setOrientation( Qt::Vertical );
m_RevGraphView = new RevGraphView(lt,cl, m_Splitter, "m_RevGraphView" );
- m_RevGraphView->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 2, m_RevGraphView->sizePolicy().hasHeightForWidth() ) );
+ m_RevGraphView->setSizePolicy( 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,
TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
@@ -63,10 +63,10 @@ RevTreeWidget::RevTreeWidget(TQObject*lt,svn::Client*cl, TQWidget* parent, const
);
m_Detailstext = new KTextBrowser( m_Splitter, "m_Detailstext" );
- m_Detailstext->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, m_Detailstext->sizePolicy().hasHeightForWidth() ) );
+ m_Detailstext->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, m_Detailstext->sizePolicy().hasHeightForWidth() ) );
m_Detailstext->setResizePolicy( KTextBrowser::Manual );
RevTreeWidgetLayout->addWidget( m_Splitter );
- resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(600, 480).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
TQValueList<int> list = Kdesvnsettings::tree_detail_height();
if (list.count()==2 && (list[0]>0||list[1]>0)) {
diff --git a/src/svnfrontend/itemdisplay.cpp b/src/svnfrontend/itemdisplay.cpp
index fb8795b..1d60730 100644
--- a/src/svnfrontend/itemdisplay.cpp
+++ b/src/svnfrontend/itemdisplay.cpp
@@ -82,13 +82,13 @@ bool ItemDisplay::filterOut(const SvnItem*item)
/*!
- \fn ItemDisplay::filterOut(const svn::tqStatus&)
+ \fn ItemDisplay::filterOut(const svn::Status&)
*/
bool ItemDisplay::filterOut(const svn::StatusPtr&item)
{
bool res = false;
- if (!item->validRepostqStatus()) {
+ if (!item->validReposStatus()) {
if ((!Kdesvnsettings::display_unknown_files() && !item->isVersioned()) ||
(Kdesvnsettings::hide_unchanged_files() && item->isRealVersioned() && !item->isModified() && !item->entry().isDir())) {
res = true;
diff --git a/src/svnfrontend/itemdisplay.h b/src/svnfrontend/itemdisplay.h
index f4d1f28..2c3ffbc 100644
--- a/src/svnfrontend/itemdisplay.h
+++ b/src/svnfrontend/itemdisplay.h
@@ -32,7 +32,7 @@ class SvnItem;
namespace svn
{
- class tqStatus;
+ class Status;
}
class ItemDisplay
diff --git a/src/svnfrontend/merge_dlg.ui b/src/svnfrontend/merge_dlg.ui
index 82aea40..728ce42 100644
--- a/src/svnfrontend/merge_dlg.ui
+++ b/src/svnfrontend/merge_dlg.ui
@@ -145,7 +145,7 @@
<property name="name">
<cstring>m_RangeInput</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
diff --git a/src/svnfrontend/mergedlg_impl.cpp b/src/svnfrontend/mergedlg_impl.cpp
index 44a07c5..b0c1d87 100644
--- a/src/svnfrontend/mergedlg_impl.cpp
+++ b/src/svnfrontend/mergedlg_impl.cpp
@@ -53,7 +53,7 @@ MergeDlg_impl::MergeDlg_impl(TQWidget *parent, const char *name,bool src1,bool s
m_OutLabel->hide();
}
adjustSize();
- setMinimumSize(tqminimumSizeHint());
+ setMinimumSize(minimumSizeHint());
m_useExternMerge->setChecked(Kdesvnsettings::extern_merge_default());
}
@@ -190,7 +190,7 @@ bool MergeDlg_impl::getMergeRange(Rangeinput_impl::revision_range&range,bool*for
dlg.setHelp("merging-items","tdesvn");
TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget();
ptr = new MergeDlg_impl(Dialog1Layout,"merge_range_dlg",false,false,false);
- dlg.resize( TQSize(480,360).expandedTo(dlg.tqminimumSizeHint()) );
+ dlg.resize( TQSize(480,360).expandedTo(dlg.minimumSizeHint()) );
if (dlg.exec()!=TQDialog::Accepted) {
return false;
}
diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp
index e67d126..f5151cf 100644
--- a/src/svnfrontend/stopdlg.cpp
+++ b/src/svnfrontend/stopdlg.cpp
@@ -164,7 +164,7 @@ void StopDlg::slotExtraMessage(const TQString&msg)
m_LogWindow = new KTextBrowser(mainWidget);
tqlayout->addWidget(m_LogWindow);
m_LogWindow->show();
- resize( TQSize(500, 400).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(500, 400).expandedTo(minimumSizeHint()) );
}
if (m_lastLogLines >= Kdesvnsettings::self()->cmdline_log_minline() &&
isHidden() ) {
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 6e102ea..45150d8 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -791,7 +791,7 @@ TQString SvnActions::getInfo(const TQString& _what,const svn::Revision&rev,const
text+=rb+i18n("Lock comment")+cs+
(*it).lockEntry().Comment()+re;
} else {
- svn::SharedPointer<svn::tqStatus> d;
+ svn::SharedPointer<svn::Status> 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;
@@ -876,7 +876,7 @@ void SvnActions::slotProperties()
TQValueList<TQString> delList;
dlg.changedItems(setList,delList);
changeProperties(setList,delList,k->fullName());
- k->refreshtqStatus();
+ k->refreshStatus();
EMIT_FINISHED;
}
@@ -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]->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
+ _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
) ) {
- if (_Cache[i]->texttqStatus()==svn_wc_status_deleted) {
+ if (_Cache[i]->textStatus()==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]->texttqStatus()==svn_wc_status_missing) {
+ } else if (_Cache[i]->textStatus()==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));
@@ -1459,7 +1459,7 @@ void SvnActions::prepareUpdate(bool ask)
}
rdlg->setStartOnly(true);
/* just here cause tqlayout has changed meanwhile */
- dlg->resize( TQSize(120,60).expandedTo(dlg->tqminimumSizeHint()) );
+ dlg->resize( TQSize(120,60).expandedTo(dlg->minimumSizeHint()) );
int result;
if ((result=dlg->exec())==TQDialog::Accepted) {
Rangeinput_impl::revision_range range = rdlg->getRange();
@@ -1521,7 +1521,7 @@ void SvnActions::makeAdd(bool rec)
#if 0
while ((cur=liter.current())!=0){
++liter;
- //cur->refreshtqStatus();
+ //cur->refreshStatus();
//emit sigRefreshCurrent(static_cast<FileListViewItem*>(cur->parent()));
}
@@ -2295,15 +2295,15 @@ void SvnActions::makeUnlock(const TQStringList&what,bool breakit)
/*!
- \fn SvnActions::maketqStatus(const TQString&what, svn::StatusEntries&dlist)
+ \fn SvnActions::makeStatus(const TQString&what, svn::StatusEntries&dlist)
*/
-bool SvnActions::maketqStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where,bool rec,bool all)
+bool SvnActions::makeStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where,bool rec,bool all)
{
bool display_ignores = Kdesvnsettings::display_ignored_files();
- return maketqStatus(what,dlist,where,rec,all,display_ignores);
+ return makeStatus(what,dlist,where,rec,all,display_ignores);
}
-bool SvnActions::maketqStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where,bool rec,bool all,bool display_ignores,bool updates)
+bool SvnActions::makeStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where,bool rec,bool all,bool display_ignores,bool updates)
{
bool disp_remote_details = Kdesvnsettings::details_on_remote_listing();
TQString ex;
@@ -2326,7 +2326,7 @@ void SvnActions::checkAddItems(const TQString&path,bool print_error_box)
svn::StatusEntries rlist;
TQStringList displist;
svn::Revision where = svn::Revision::HEAD;
- if (!maketqStatus(path,dlist,where,true,true,false,false)) {
+ if (!makeStatus(path,dlist,where,true,true,false,false)) {
return;
}
for (unsigned int i = 0; i<dlist.size();++i) {
@@ -2402,7 +2402,7 @@ void SvnActions::stopFillCache()
}
delete m_FCThread;
m_FCThread = 0;
- emit sigCachetqStatus(-1,-1);
+ emit sigCacheStatus(-1,-1);
}
}
@@ -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]->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_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_Data->m_Cache.insertKey(ptr,ptr->path());
- } else if (m_CThread->getList()[i]->texttqStatus()==svn_wc_status_conflicted) {
+ } else if (m_CThread->getList()[i]->textStatus()==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->validRepostqStatus()) {
+ if (ptr->validReposStatus()) {
m_Data->m_UpdateCache.insertKey(ptr,ptr->path());
- ptr->texttqStatus();
- ptr->proptqStatus();
- if (!(ptr->validLocaltqStatus())) {
+ ptr->textStatus();
+ ptr->propStatus();
+ if (!(ptr->validLocalStatus())) {
newer = true;
}
}
@@ -2514,7 +2514,7 @@ bool SvnActions::checkUpdatesRunning()
void SvnActions::addModifiedCache(const svn::StatusPtr&what)
{
- if (what->texttqStatus()==svn_wc_status_conflicted) {
+ if (what->textStatus()==svn_wc_status_conflicted) {
m_Data->m_conflictCache.insertKey(what,what->path());
} else {
m_Data->m_Cache.insertKey(what,what->path());
@@ -2539,9 +2539,9 @@ bool SvnActions::checkReposLockCache(const TQString&path)
return m_Data->m_repoLockCache.findSingleValid(path,false);
}
-bool SvnActions::checkReposLockCache(const TQString&path,svn::SharedPointer<svn::tqStatus>&t)
+bool SvnActions::checkReposLockCache(const TQString&path,svn::SharedPointer<svn::Status>&t)
{
- /// @todo create a method where svn::tqStatus* will be a parameter so no copy is needed but just reading content
+ /// @todo create a method where svn::Status* will be a parameter so no copy is needed but just reading content
return m_Data->m_repoLockCache.findSingleValid(path,t);
}
@@ -2599,7 +2599,7 @@ void SvnActions::customEvent(TQCustomEvent * e)
return;
} else if (e&&e->type()==EVENT_LOGCACHE_STATUS && m_FCThread && m_FCThread->running()) {
FillCacheStatusEvent*fev=(FillCacheStatusEvent*)e;
- emit sigCachetqStatus(fev->current(),fev->max());
+ emit sigCacheStatus(fev->current(),fev->max());
}
}
@@ -2638,11 +2638,11 @@ void SvnActions::removeFromUpdateCache(const TQStringList&what,bool exact_only)
bool SvnActions::isUpdated(const TQString&path)const
{
- svn::SharedPointer<svn::tqStatus> d;
+ svn::SharedPointer<svn::Status> d;
return m_Data->m_UpdateCache.findSingleValid(path,d);
}
-bool SvnActions::getUpdated(const TQString&path,svn::SharedPointer<svn::tqStatus>&d)const
+bool SvnActions::getUpdated(const TQString&path,svn::SharedPointer<svn::Status>&d)const
{
return m_Data->m_UpdateCache.findSingleValid(path,d);
}
diff --git a/src/svnfrontend/svnactions.h b/src/svnfrontend/svnactions.h
index 02f0bcb..dc7645a 100644
--- a/src/svnfrontend/svnactions.h
+++ b/src/svnfrontend/svnactions.h
@@ -95,15 +95,15 @@ public:
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 makeStatus(const TQString&what, svn::StatusEntries&dlist, svn::Revision&where, bool rec=false,bool all=true);
+ bool makeStatus(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<svn::tqStatus>&t);
+ bool checkReposLockCache(const TQString&path,svn::SharedPointer<svn::Status>&t);
void addModifiedCache(const svn::StatusPtr&what);
void deleteFromModifiedCache(const TQString&what);
@@ -152,7 +152,7 @@ public:
bool createUpdateCache(const TQString&what);
bool checkUpdateCache(const TQString&path)const;
bool isUpdated(const TQString&path)const;
- bool getUpdated(const TQString&path,svn::SharedPointer<svn::tqStatus>&d)const;
+ bool getUpdated(const TQString&path,svn::SharedPointer<svn::Status>&d)const;
void clearUpdateCache();
void removeFromUpdateCache(const TQStringList&what,bool exact_only);
void stopCheckModThread();
@@ -242,7 +242,7 @@ signals:
void sigRefreshIcons(bool);
void sigExtraLogMsg(const TQString&);
void sigGotourl(const TQString&);
- void sigCachetqStatus(TQ_LONG,TQ_LONG);
+ void sigCacheStatus(TQ_LONG,TQ_LONG);
protected slots:
virtual void wroteStdin(KProcess*);
diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp
index 3619f7e..3513e4f 100644
--- a/src/svnfrontend/svnfiletip.cpp
+++ b/src/svnfrontend/svnfiletip.cpp
@@ -46,7 +46,7 @@ SvnFileTip::SvnFileTip(TQScrollView*parent)
{
m_iconLabel = new TQLabel(this);
m_textLabel = new TQLabel(this);
- m_textLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignTop);
+ m_textLabel->setAlignment(TQt::AlignAuto | TQt::AlignTop);
TQGridLayout* tqlayout = new TQGridLayout(this, 1, 2, 8, 0);
tqlayout->addWidget(m_iconLabel, 0, 0);
@@ -190,7 +190,7 @@ void SvnFileTip::drawContents( TQPainter *p )
}
if ( m_corners[m_corner].isNull())
- m_corners[m_corner].load( locate( "data", TQString::tqfromLatin1( "konqueror/pics/%1.png" ).tqarg( names[m_corner] ) ) );
+ m_corners[m_corner].load( locate( "data", TQString::fromLatin1( "konqueror/pics/%1.png" ).tqarg( names[m_corner] ) ) );
TQPixmap &pix = m_corners[m_corner];
diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp
index 55015a3..dee0435 100644
--- a/src/svnfrontend/svnitem.cpp
+++ b/src/svnfrontend/svnitem.cpp
@@ -68,7 +68,7 @@ protected:
};
SvnItem_p::SvnItem_p()
- :ref_count(),m_Stat(new svn::tqStatus())
+ :ref_count(),m_Stat(new svn::Status())
{
init();
}
@@ -238,11 +238,11 @@ TQPixmap SvnItem::getPixmap(const TQPixmap&_p,int size,bool overlay)
SvnActions*wrap = getWrapper();
bool mod = false;
TQPixmap p2 = TQPixmap();
- if (p_Item->m_Stat->texttqStatus()==svn_wc_status_conflicted) {
+ if (p_Item->m_Stat->textStatus()==svn_wc_status_conflicted) {
m_bgColor = CONFLICT;
if (overlay)
p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnconflicted",KIcon::Desktop,size);
- } else if (p_Item->m_Stat->texttqStatus ()==svn_wc_status_missing) {
+ } else if (p_Item->m_Stat->textStatus ()==svn_wc_status_missing) {
m_bgColor = MISSING;
} else if (isLocked()||wrap->checkReposLockCache(fullName())) {
if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnlocked",KIcon::Desktop,size);
@@ -253,10 +253,10 @@ TQPixmap SvnItem::getPixmap(const TQPixmap&_p,int size,bool overlay)
} else if (wrap->isUpdated(p_Item->m_Stat->path())) {
if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnupdates",KIcon::Desktop,size);
m_bgColor = UPDATES;
- } else if (p_Item->m_Stat->texttqStatus()==svn_wc_status_deleted) {
+ } else if (p_Item->m_Stat->textStatus()==svn_wc_status_deleted) {
if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvndeleted",KIcon::Desktop,size);
m_bgColor = DELETED;
- } else if (p_Item->m_Stat->texttqStatus()==svn_wc_status_added ) {
+ } else if (p_Item->m_Stat->textStatus()==svn_wc_status_added ) {
if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnadded",KIcon::Desktop,size);
m_bgColor = ADDED;
} else if (isModified()) {
@@ -358,26 +358,26 @@ bool SvnItem::isRealVersioned()const
bool SvnItem::isIgnored()const
{
- return p_Item->m_Stat->texttqStatus()==svn_wc_status_ignored;
+ return p_Item->m_Stat->textStatus()==svn_wc_status_ignored;
}
bool SvnItem::isRemoteAdded()const
{
return getWrapper()->isUpdated(p_Item->m_Stat->path()) &&
- p_Item->m_Stat->validRepostqStatus()&&!p_Item->m_Stat->validLocaltqStatus();
+ p_Item->m_Stat->validReposStatus()&&!p_Item->m_Stat->validLocalStatus();
}
TQString SvnItem::infoText()const
{
TQString info_text = "";
if (getWrapper()->isUpdated(p_Item->m_Stat->path())) {
- if (p_Item->m_Stat->validRepostqStatus()&&!p_Item->m_Stat->validLocaltqStatus()) {
+ if (p_Item->m_Stat->validReposStatus()&&!p_Item->m_Stat->validLocalStatus()) {
info_text = i18n("Added in repository");
} else {
info_text = i18n("Needs update");
}
} else {
- switch(p_Item->m_Stat->texttqStatus ()) {
+ switch(p_Item->m_Stat->textStatus ()) {
case svn_wc_status_modified:
info_text = i18n("Locally modified");
break;
@@ -412,7 +412,7 @@ TQString SvnItem::infoText()const
break;
}
if (info_text.isEmpty()) {
- switch (p_Item->m_Stat->proptqStatus ()) {
+ switch (p_Item->m_Stat->propStatus ()) {
case svn_wc_status_modified:
info_text = i18n("Property modified");
break;
@@ -444,7 +444,7 @@ TQString SvnItem::lockOwner()const
if (p_Item->m_Stat->entry().lockEntry().Locked()) {
return p_Item->m_Stat->entry().lockEntry().Owner();
}
- svn::SharedPointer<svn::tqStatus> tmp;
+ svn::SharedPointer<svn::Status> tmp;
if (getWrapper()->checkReposLockCache(fullName(),tmp) && tmp) {
return tmp->lockEntry().Owner();
}
@@ -457,8 +457,8 @@ TQString SvnItem::lockOwner()const
*/
bool SvnItem::isModified()const
{
- 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;
+ 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;
}
const svn::StatusPtr& SvnItem::stat()const
@@ -472,22 +472,22 @@ const svn::StatusPtr& SvnItem::stat()const
*/
bool SvnItem::isNormal()const
{
- return p_Item->m_Stat->texttqStatus()==svn_wc_status_normal;
+ return p_Item->m_Stat->textStatus()==svn_wc_status_normal;
}
bool SvnItem::isMissing()const
{
- return p_Item->m_Stat->texttqStatus()==svn_wc_status_missing;
+ return p_Item->m_Stat->textStatus()==svn_wc_status_missing;
}
bool SvnItem::isDeleted()const
{
- return p_Item->m_Stat->texttqStatus()==svn_wc_status_deleted;
+ return p_Item->m_Stat->textStatus()==svn_wc_status_deleted;
}
bool SvnItem::isConflicted()const
{
- return p_Item->m_Stat->texttqStatus()==svn_wc_status_conflicted;
+ return p_Item->m_Stat->textStatus()==svn_wc_status_conflicted;
}
/*!
diff --git a/src/svnfrontend/svnitem.h b/src/svnfrontend/svnitem.h
index 11458fa..76c2533 100644
--- a/src/svnfrontend/svnitem.h
+++ b/src/svnfrontend/svnitem.h
@@ -68,7 +68,7 @@ public:
virtual TQString getParentDir()const=0;
virtual SvnItem* getParentItem()const=0;
virtual const svn::Revision&correctPeg()const=0;
- virtual void refreshtqStatus(bool childs=false,TQPtrList<SvnItem> *exclude = 0,bool depsonly=false)=0;
+ virtual void refreshStatus(bool childs=false,TQPtrList<SvnItem> *exclude = 0,bool depsonly=false)=0;
TQPixmap getPixmap(int size,bool overlay=true);
TQPixmap getPixmap(const TQPixmap&,int size,bool overlay=true);
diff --git a/src/svnfrontend/svnlogdlg.ui b/src/svnfrontend/svnlogdlg.ui
index 1c139cb..77dca8b 100644
--- a/src/svnfrontend/svnlogdlg.ui
+++ b/src/svnfrontend/svnlogdlg.ui
@@ -81,7 +81,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>107</width>
<height>20</height>
@@ -321,7 +321,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>42</width>
<height>20</height>
diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp
index a81ce18..4d45190 100644
--- a/src/svnfrontend/svnlogdlgimp.cpp
+++ b/src/svnfrontend/svnlogdlgimp.cpp
@@ -444,9 +444,9 @@ void SvnLogDlgImp::saveSize()
TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
KConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName);
TQSize sizeToSave = size();
- Kdesvnsettings::self()->config()->writeEntry( TQString::tqfromLatin1("Width %1").tqarg( desk.width()),
+ Kdesvnsettings::self()->config()->writeEntry( TQString::fromLatin1("Width %1").tqarg( desk.width()),
TQString::number( sizeToSave.width()), true, false);
- Kdesvnsettings::self()->config()->writeEntry( TQString::tqfromLatin1("Height %1").tqarg( desk.height()),
+ Kdesvnsettings::self()->config()->writeEntry( TQString::fromLatin1("Height %1").tqarg( desk.height()),
TQString::number( sizeToSave.height()), true, false);
}
@@ -455,11 +455,11 @@ TQSize SvnLogDlgImp::dialogSize()
int w, h;
int scnum = TQApplication::desktop()->screenNumber(parentWidget());
TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
- w = tqsizeHint().width();
- h = tqsizeHint().height();
+ w = sizeHint().width();
+ h = sizeHint().height();
KConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName);
- 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 );
+ w = Kdesvnsettings::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").tqarg( desk.width()), w );
+ h = Kdesvnsettings::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").tqarg( desk.height()), h );
return( TQSize( w, h ) );
}
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index 131ea18..dc0b7c0 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -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);
}
@@ -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()
@@ -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);
}
@@ -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;
@@ -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);
}
}
@@ -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);
}
@@ -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;
@@ -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()*/
@@ -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);
@@ -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();
}
diff --git a/src/svnfrontend/tdesvnfilelist.h b/src/svnfrontend/tdesvnfilelist.h
index 97cb902..b121138 100644
--- a/src/svnfrontend/tdesvnfilelist.h
+++ b/src/svnfrontend/tdesvnfilelist.h
@@ -190,7 +190,7 @@ signals:
void sigUrlChanged(const TQString&);
void sigProplist(const svn::PathPropertiesMapListPtr&,bool,const TQString&);
void sigListError();
- void sigCachetqStatus(TQ_LONG,TQ_LONG);
+ void sigCacheStatus(TQ_LONG,TQ_LONG);
public slots:
virtual void refreshCurrentTree();
diff --git a/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp b/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp
index 46e165f..d104e66 100644
--- a/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp
+++ b/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp
@@ -81,7 +81,7 @@ public:
sqlite3_stmt *stmt;
- uint skippedtqStatus: 1; // the status of the fetchNext() that's skipped
+ uint skippedStatus: 1; // the status of the fetchNext() that's skipped
uint skipRow: 1; // skip the next fetchNext()?
uint utf8: 1;
TQSqlRecord rInf;
@@ -90,7 +90,7 @@ public:
static const uint initial_cache_size = 128;
TQSQLite3ResultPrivate::TQSQLite3ResultPrivate(TQSQLite3Result* res) : q(res), access(0),
- stmt(0), skippedtqStatus(false), skipRow(false), utf8(false)
+ stmt(0), skippedStatus(false), skipRow(false), utf8(false)
{
}
@@ -98,7 +98,7 @@ void TQSQLite3ResultPrivate::cleanup()
{
finalize();
rInf.clear();
- skippedtqStatus = false;
+ skippedStatus = false;
skipRow = false;
q->setAt(TQSql::BeforeFirst);
q->setActive(false);
@@ -143,7 +143,7 @@ bool TQSQLite3ResultPrivate::fetchNext(TQSqlCachedResult::ValueCache &values, in
// already fetched
Q_ASSERT(!initialFetch);
skipRow = false;
- return skippedtqStatus;
+ return skippedStatus;
}
skipRow = initialFetch;
@@ -226,7 +226,7 @@ bool TQSQLite3Result::reset (const TQString &query)
return false;
}
- d->skippedtqStatus = d->fetchNext(cache(), 0, true);
+ d->skippedStatus = d->fetchNext(cache(), 0, true);
setSelect(!d->rInf.isEmpty());
setActive(true);
diff --git a/src/svnqt/client.hpp b/src/svnqt/client.hpp
index 4fb6015..70195ac 100644
--- a/src/svnqt/client.hpp
+++ b/src/svnqt/client.hpp
@@ -125,7 +125,7 @@ namespace svn
* @param revision list specific revision when browsing remote, on working copies parameter will ignored
* @param detailed_remote if on remote listing detailed item info should get if possible
* that may slow so should configureable in frontends!
- * @return vector with tqStatus entries.
+ * @return vector with Status entries.
*/
virtual StatusEntries
status (const Path& path,
@@ -146,10 +146,10 @@ namespace svn
* @param path File to gather status.
* @param update if check against repository if new updates are there (for WC only)
* @param revision list specific revision when browsing remote, on working copies parameter will ignored
- * @return a tqStatus with Statis.isVersioned = FALSE
+ * @return a Status with Statis.isVersioned = FALSE
*/
virtual StatusPtr
- singletqStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException)=0;
+ singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException)=0;
/**
* Executes a revision checkout.
diff --git a/src/svnqt/client_impl.hpp b/src/svnqt/client_impl.hpp
index 25d5b62..361603b 100644
--- a/src/svnqt/client_impl.hpp
+++ b/src/svnqt/client_impl.hpp
@@ -96,7 +96,7 @@ namespace svn
* @param revision list specific revision when browsing remote, on working copies parameter will ignored
* @param detailed_remote if on remote listing detailed item info should get if possible
* that may slow so should configureable in frontends!
- * @return vector with tqStatus entries.
+ * @return vector with Status entries.
*/
virtual StatusEntries
status (const Path& path,
@@ -117,10 +117,10 @@ namespace svn
* @param path File to gather status.
* @param update if check against repository if new updates are there (for WC only)
* @param revision list specific revision when browsing remote, on working copies parameter will ignored
- * @return a tqStatus with Statis.isVersioned = FALSE
+ * @return a Status with Statis.isVersioned = FALSE
*/
virtual StatusPtr
- singletqStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException);
+ singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException);
/**
* Executes a revision checkout.
diff --git a/src/svnqt/client_status.cpp b/src/svnqt/client_status.cpp
index 4468b0d..1c58610 100644
--- a/src/svnqt/client_status.cpp
+++ b/src/svnqt/client_status.cpp
@@ -269,7 +269,7 @@ namespace svn
}
static StatusEntries
- localtqStatus (const Path& path,
+ localStatus (const Path& path,
Depth depth,
const bool get_all,
const bool update,
@@ -342,28 +342,28 @@ namespace svn
status = (svn_wc_status2_t *) item->value;
filePath = (const char *) item->key;
- entries.push_back (StatusPtr(new tqStatus(filePath, status)));
+ entries.push_back (StatusPtr(new Status(filePath, status)));
}
return entries;
}
static StatusPtr
- dirEntryTotqStatus (const Path& path, DirEntryPtr dirEntry)
+ dirEntryToStatus (const Path& path, DirEntryPtr dirEntry)
{
TQString url = path.path();
url += TQString::FROMUTF8("/");
url += dirEntry->name();
- return StatusPtr(new tqStatus (url, dirEntry));
+ return StatusPtr(new Status (url, dirEntry));
}
static StatusPtr
- infoEntryTotqStatus(const Path&,const InfoEntry&infoEntry)
+ infoEntryToStatus(const Path&,const InfoEntry&infoEntry)
{
- return StatusPtr(new tqStatus(infoEntry.url(),infoEntry));
+ return StatusPtr(new Status(infoEntry.url(),infoEntry));
}
static StatusEntries
- remotetqStatus (Client * client,
+ remoteStatus (Client * client,
const Path& path,
Depth depth,
const bool ,
@@ -385,7 +385,7 @@ namespace svn
DirEntryPtr dirEntry = *it;
if (dirEntry->name().isEmpty())
continue;
- entries.push_back(dirEntryTotqStatus (path, dirEntry));
+ entries.push_back(dirEntryToStatus (path, dirEntry));
}
return entries;
}
@@ -402,16 +402,16 @@ namespace svn
const StringArray & changelists) throw (ClientException)
{
if (Url::isValid (path.path())) {
- return remotetqStatus (this, path, depth, get_all, update,
+ return remoteStatus (this, path, depth, get_all, update,
no_ignore,revision,m_context,detailed_remote);
} else {
- return localtqStatus (path, depth, get_all, update,
+ return localStatus (path, depth, get_all, update,
no_ignore, hide_externals,changelists, m_context);
}
}
static StatusPtr
- localSingletqStatus (const Path& path, Context * context,bool update=false)
+ localSingleStatus (const Path& path, Context * context,bool update=false)
{
svn_error_t *error;
apr_hash_t *status_hash;
@@ -470,26 +470,26 @@ namespace svn
status = (svn_wc_status2_t *) item->value;
filePath = (const char *) item->key;
- return StatusPtr(new tqStatus (filePath, status));
+ return StatusPtr(new Status (filePath, status));
};
static StatusPtr
- remoteSingletqStatus (Client * client, const Path& path,const Revision revision, Context * )
+ remoteSingleStatus (Client * client, const Path& path,const Revision revision, Context * )
{
InfoEntries infoEntries = client->info(path,DepthEmpty,revision,Revision(Revision::UNDEFINED));
if (infoEntries.size () == 0)
- return StatusPtr(new tqStatus());
+ return StatusPtr(new Status());
else
- return infoEntryTotqStatus (path, infoEntries [0]);
+ return infoEntryToStatus (path, infoEntries [0]);
}
StatusPtr
- Client_impl::singletqStatus (const Path& path,bool update,const Revision revision) throw (ClientException)
+ Client_impl::singleStatus (const Path& path,bool update,const Revision revision) throw (ClientException)
{
if (Url::isValid (path.path()))
- return remoteSingletqStatus (this, path,revision, m_context);
+ return remoteSingleStatus (this, path,revision, m_context);
else
- return localSingletqStatus (path, m_context,update);
+ return localSingleStatus (path, m_context,update);
}
bool
diff --git a/src/svnqt/dirent.cpp b/src/svnqt/dirent.cpp
index 7a42ae7..9015d13 100644
--- a/src/svnqt/dirent.cpp
+++ b/src/svnqt/dirent.cpp
@@ -60,7 +60,7 @@ namespace svn
hasProps (dirEntry->has_props != 0),
createdRev (dirEntry->created_rev), time (dirEntry->time), m_Lock()
{
- lastAuthor = dirEntry->last_author == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(dirEntry->last_author);
+ lastAuthor = dirEntry->last_author == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(dirEntry->last_author);
}
DirEntry_Data (const DirEntry & src)
diff --git a/src/svnqt/log_entry.cpp b/src/svnqt/log_entry.cpp
index f641b17..720642d 100644
--- a/src/svnqt/log_entry.cpp
+++ b/src/svnqt/log_entry.cpp
@@ -96,8 +96,8 @@ namespace svn
const char *message_;
svn_compat_log_revprops_out(&author_, &date_, &message_, log_entry->revprops);
- author = author_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(author_);
- message = message_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(message_);
+ author = author_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(author_);
+ message = message_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(message_);
setDate(date_);
revision = log_entry->revision;
if (log_entry->changed_paths) {
@@ -125,8 +125,8 @@ namespace svn
setDate(date_);
revision = revision_;
- author = author_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(author_);
- message = message_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(message_);
+ author = author_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(author_);
+ message = message_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(message_);
}
void LogEntry::setDate(const char*date_)
diff --git a/src/svnqt/path.cpp b/src/svnqt/path.cpp
index 4281de7..4e0b14d 100644
--- a/src/svnqt/path.cpp
+++ b/src/svnqt/path.cpp
@@ -213,7 +213,7 @@ namespace svn
if (pos == -1)
{
filename = basename;
- ext = TQString::tqfromLatin1("");
+ ext = TQString::fromLatin1("");
}
else
{
diff --git a/src/svnqt/status.cpp b/src/svnqt/status.cpp
index a7913f6..c5e47a3 100644
--- a/src/svnqt/status.cpp
+++ b/src/svnqt/status.cpp
@@ -175,7 +175,7 @@ namespace svn
m_hasReal=true;
}
- tqStatus::tqStatus (const tqStatus & src)
+ Status::Status (const Status & src)
: m_Data(new Status_private())
{
if( &src != this )
@@ -188,37 +188,37 @@ namespace svn
}
}
- tqStatus::tqStatus (const TQString&path, svn_wc_status2_t * status)
+ Status::Status (const TQString&path, svn_wc_status2_t * status)
: m_Data(new Status_private())
{
m_Data->init(path, status);
}
- tqStatus::tqStatus (const char*path, svn_wc_status2_t * status)
+ Status::Status (const char*path, svn_wc_status2_t * status)
: m_Data(new Status_private())
{
m_Data->init(TQString::FROMUTF8(path),status);
}
- tqStatus::tqStatus(const TQString&url,const DirEntryPtr&src)
+ Status::Status(const TQString&url,const DirEntryPtr&src)
: m_Data(new Status_private())
{
m_Data->init(url,src);
}
- tqStatus::tqStatus(const TQString&url,const InfoEntry&src)
+ Status::Status(const TQString&url,const InfoEntry&src)
: m_Data(new Status_private())
{
m_Data->init(url,src);
}
- tqStatus::~tqStatus ()
+ Status::~Status ()
{
delete m_Data;
}
- tqStatus &
- tqStatus::operator=(const tqStatus & status)
+ Status &
+ Status::operator=(const Status & status)
{
if (this == &status)
return *this;
@@ -231,89 +231,89 @@ namespace svn
}
const LockEntry&
- tqStatus::lockEntry () const
+ Status::lockEntry () const
{
return m_Data->m_Lock;
}
svn_wc_status_kind
- tqStatus::reposProptqStatus () const
+ Status::reposPropStatus () const
{
return m_Data->_repos_prop_status;
}
svn_wc_status_kind
- tqStatus::reposTexttqStatus () const
+ Status::reposTextStatus () const
{
return m_Data->_repos_text_status;
}
bool
- tqStatus::isSwitched () const
+ Status::isSwitched () const
{
return m_Data->_switched != 0;
}
bool
- tqStatus::isCopied () const
+ Status::isCopied () const
{
return m_Data->_copied;
}
bool
- tqStatus::isLocked () const
+ Status::isLocked () const
{
return m_Data->m_Lock.Locked();
}
bool
- tqStatus::isModified()const
+ Status::isModified()const
{
- return texttqStatus()==svn_wc_status_modified||proptqStatus()==svn_wc_status_modified
- ||texttqStatus ()==svn_wc_status_replaced;
+ return textStatus()==svn_wc_status_modified||propStatus()==svn_wc_status_modified
+ ||textStatus ()==svn_wc_status_replaced;
}
bool
- tqStatus::isRealVersioned()const
+ Status::isRealVersioned()const
{
return m_Data->m_hasReal;
}
bool
- tqStatus::isVersioned () const
+ Status::isVersioned () const
{
return m_Data->m_isVersioned;
}
svn_wc_status_kind
- tqStatus::proptqStatus () const
+ Status::propStatus () const
{
return m_Data->_prop_status;
}
svn_wc_status_kind
- tqStatus::texttqStatus () const
+ Status::textStatus () const
{
return m_Data->_text_status;
}
const Entry&
- tqStatus::entry () const
+ Status::entry () const
{
return m_Data->m_entry;
}
const TQString&
- tqStatus::path () const
+ Status::path () const
{
return m_Data->m_Path;
}
bool
- tqStatus::validRepostqStatus()const
+ Status::validReposStatus()const
{
- return reposTexttqStatus()!=svn_wc_status_none||reposProptqStatus()!=svn_wc_status_none;
+ return reposTextStatus()!=svn_wc_status_none||reposPropStatus()!=svn_wc_status_none;
}
bool
- tqStatus::validLocaltqStatus()const
+ Status::validLocalStatus()const
{
- return texttqStatus()!=svn_wc_status_none||proptqStatus()!=svn_wc_status_none;
+ return textStatus()!=svn_wc_status_none||propStatus()!=svn_wc_status_none;
}
}
diff --git a/src/svnqt/status.hpp b/src/svnqt/status.hpp
index 3b6e03e..281f905 100644
--- a/src/svnqt/status.hpp
+++ b/src/svnqt/status.hpp
@@ -53,13 +53,13 @@ namespace svn
*/
class Status_private;
- class SVNTQT_EXPORT tqStatus
+ class SVNTQT_EXPORT Status
{
public:
/**
* copy constructor
*/
- tqStatus (const tqStatus & src);
+ Status (const Status & src);
/**
* default constructor
@@ -67,27 +67,27 @@ namespace svn
* @param path path for this status entry
* @param status status entry
*/
- tqStatus (const TQString&path=TQString(), svn_wc_status2_t * status = NULL);
+ Status (const TQString&path=TQString(), svn_wc_status2_t * status = NULL);
/**
* default constructor
*
* @param path path for this status entry
* @param status status entry
*/
- tqStatus (const char*path, svn_wc_status2_t * status = NULL);
+ Status (const char*path, svn_wc_status2_t * status = NULL);
/**
* converting constructor
*/
- tqStatus(const TQString&path,const DirEntryPtr&src);
+ Status(const TQString&path,const DirEntryPtr&src);
/**
* converting constructor
*/
- tqStatus(const TQString&path,const InfoEntry&src);
+ Status(const TQString&path,const InfoEntry&src);
/**
* destructor
*/
- virtual ~tqStatus ();
+ virtual ~Status ();
/**
* @return path of status entry
@@ -105,13 +105,13 @@ namespace svn
* @return file status property enum of the "textual" component.
*/
svn_wc_status_kind
- texttqStatus () const;
+ textStatus () const;
/**
* @return file status property enum of the "property" component.
*/
svn_wc_status_kind
- proptqStatus () const;
+ propStatus () const;
/**
* @retval TRUE if under version control
@@ -152,28 +152,28 @@ namespace svn
* @return the entry's text status in the repository
*/
svn_wc_status_kind
- reposTexttqStatus () const;
+ reposTextStatus () const;
/**
* @return the entry's prop status in the repository
*/
svn_wc_status_kind
- reposProptqStatus () const;
+ reposPropStatus () const;
const LockEntry&
lockEntry () const;
bool
- validRepostqStatus()const;
+ validReposStatus()const;
bool
- validLocaltqStatus()const;
+ validLocalStatus()const;
/**
* assignment operator
*/
- tqStatus &
- operator = (const tqStatus &);
+ Status &
+ operator = (const Status &);
private:
Status_private*m_Data;
};
diff --git a/src/svnqt/svnqttypes.hpp b/src/svnqt/svnqttypes.hpp
index 5b470f2..5d16658 100644
--- a/src/svnqt/svnqttypes.hpp
+++ b/src/svnqt/svnqttypes.hpp
@@ -41,7 +41,7 @@ namespace svn
class InfoEntry;
class LogEntry;
class Revision;
- class tqStatus;
+ class Status;
class Targets;
class Path;
class StringArray;
@@ -61,7 +61,7 @@ namespace svn
/// shared_pointer for LogEntriesMap
typedef SharedPointer<LogEntriesMap> LogEntriesMapPtr;
- typedef SharedPointer<tqStatus> StatusPtr;
+ typedef SharedPointer<Status> StatusPtr;
typedef TQLIST<StatusPtr> StatusEntries;
typedef TQLIST<Revision> Revisions;
diff --git a/src/svnqt/url.cpp b/src/svnqt/url.cpp
index 2478997..6f55356 100644
--- a/src/svnqt/url.cpp
+++ b/src/svnqt/url.cpp
@@ -64,10 +64,10 @@ namespace svn
{
bool cs = false;
if (
- url.tqstartsWith("file://",cs) ||
- url.tqstartsWith("/") ||
- url.tqstartsWith("svn+file://",cs) ||
- url.tqstartsWith("ksvn+file://",cs) )
+ url.startsWith("file://",cs) ||
+ url.startsWith("/") ||
+ url.startsWith("svn+file://",cs) ||
+ url.startsWith("ksvn+file://",cs) )
{
return true;
}
diff --git a/src/svnqt/wc.cpp b/src/svnqt/wc.cpp
index 4729696..bf3b5dd 100644
--- a/src/svnqt/wc.cpp
+++ b/src/svnqt/wc.cpp
@@ -116,7 +116,7 @@ namespace svn
TQString result = "";
const svn_wc_entry_t *entry;
entry = getEntry( path );
- result = entry ? TQString::FROMUTF8(entry->repos) : TQString::tqfromLatin1("");
+ result = entry ? TQString::FROMUTF8(entry->repos) : TQString::fromLatin1("");
return result;
}
diff --git a/src/tdesvn.cpp b/src/tdesvn.cpp
index 05ed762..597978c 100644
--- a/src/tdesvn.cpp
+++ b/src/tdesvn.cpp
@@ -81,11 +81,11 @@ tdesvn::tdesvn()
// and a status bar
statusBar()->show();
- m_bookmarkFile = locateLocal("appdata",TQString::tqfromLatin1("bookmarks.xml"),true);
+ m_bookmarkFile = locateLocal("appdata",TQString::fromLatin1("bookmarks.xml"),true);
m_BookmarkManager = KBookmarkManager::managerForFile(m_bookmarkFile,false);
m_BookmarkManager->setShowNSBookmarks(false);
- m_BookmarkManager->setEditorOptions(TQString::tqfromLatin1("KDE Svn"),false);
+ m_BookmarkManager->setEditorOptions(TQString::fromLatin1("KDE Svn"),false);
m_BookmarksActionmenu = new KActionMenu(i18n("&Bookmarks"),"bookmark",actionCollection(),"bookmarks");
m_BookmarksActionmenu->setDelayed(false);
diff --git a/src/tdesvnview.cpp b/src/tdesvnview.cpp
index f354e0a..b3fead2 100644
--- a/src/tdesvnview.cpp
+++ b/src/tdesvnview.cpp
@@ -75,7 +75,7 @@ tdesvnView::tdesvnView(KActionCollection*aCollection,TQWidget *parent,const char
m_infoSplitter = new TQSplitter(m_Splitter);
m_infoSplitter->setOrientation( Qt::Horizontal );
- m_infoSplitter->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 1, m_infoSplitter->sizePolicy().hasHeightForWidth() ) );
+ m_infoSplitter->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 1, m_infoSplitter->sizePolicy().hasHeightForWidth() ) );
m_LogWindow=new KTextBrowser(m_infoSplitter);
Propertylist*pl = new Propertylist(m_infoSplitter);
pl->setCommitchanges(true);
@@ -83,7 +83,7 @@ tdesvnView::tdesvnView(KActionCollection*aCollection,TQWidget *parent,const char
connect(m_flist,TQT_SIGNAL(sigProplist(const svn::PathPropertiesMapListPtr&,bool,const TQString&)),
pl,TQT_SLOT(displayList(const svn::PathPropertiesMapListPtr&,bool,const TQString&)));
- m_flist->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 1, m_flist->sizePolicy().hasHeightForWidth() ) );
+ m_flist->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 1, m_flist->sizePolicy().hasHeightForWidth() ) );
m_topLayout->addWidget(m_Splitter);
connect(m_flist,TQT_SIGNAL(sigLogMessage(const TQString&)),this,TQT_SLOT(slotAppendLog(const TQString&)));
@@ -92,7 +92,7 @@ tdesvnView::tdesvnView(KActionCollection*aCollection,TQWidget *parent,const char
connect(m_flist,TQT_SIGNAL(sigUrlOpend(bool)),parent,TQT_SLOT(slotUrlOpened(bool)));
connect(m_flist,TQT_SIGNAL(sigSwitchUrl(const KURL&)),this,TQT_SIGNAL(sigSwitchUrl(const KURL&)));
connect(m_flist,TQT_SIGNAL(sigUrlChanged( const TQString& )),this,TQT_SLOT(slotUrlChanged(const TQString&)));
- connect(m_flist,TQT_SIGNAL(sigCachetqStatus(TQ_LONG,TQ_LONG)),this,TQT_SLOT(fillCachetqStatus(TQ_LONG,TQ_LONG)));
+ connect(m_flist,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQT_SLOT(fillCacheStatus(TQ_LONG,TQ_LONG)));
connect(this,TQT_SIGNAL(sigMakeBaseDirs()),m_flist,TQT_SLOT(slotMkBaseDirs()));
KConfigGroup cs(Kdesvnsettings::self()->config(),"tdesvn-maintqlayout");
TQString t1 = cs.readEntry("split1",TQString());
@@ -462,7 +462,7 @@ void tdesvnView::setCanceled(bool how)
m_ReposCancel = how;
}
-void tdesvnView::fillCachetqStatus(TQ_LONG current,TQ_LONG max)
+void tdesvnView::fillCacheStatus(TQ_LONG current,TQ_LONG max)
{
if (current>-1 && max>-1) {
kdDebug()<<"Fillcache "<<current<<" von "<<max<<endl;
diff --git a/src/tdesvnview.h b/src/tdesvnview.h
index 3988ed7..42a5e01 100644
--- a/src/tdesvnview.h
+++ b/src/tdesvnview.h
@@ -117,7 +117,7 @@ public slots:
/* repositorylistener methods */
virtual void setCanceled(bool);
- virtual void fillCachetqStatus(TQ_LONG,TQ_LONG);
+ virtual void fillCacheStatus(TQ_LONG,TQ_LONG);
protected slots:
virtual void slotOnURL(const TQString& url);
diff --git a/src/urldlg.cpp b/src/urldlg.cpp
index c1ae158..a58cf5d 100644
--- a/src/urldlg.cpp
+++ b/src/urldlg.cpp
@@ -55,10 +55,10 @@ void UrlDlg::init_dlg()
KHistoryCombo * combo = new KHistoryCombo(0,"history_combo");
combo->setDuplicatesEnabled(false);
KConfig *kc = KGlobal::config();
- KConfigGroupSaver ks( kc, TQString::tqfromLatin1("Open-repository settings") );
- int max = kc->readNumEntry( TQString::tqfromLatin1("Maximum history"), 15 );
+ KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-repository settings") );
+ int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 );
combo->setMaxCount( max );
- TQStringList list = kc->readListEntry( TQString::tqfromLatin1("History") );
+ TQStringList list = kc->readListEntry( TQString::fromLatin1("History") );
combo->setHistoryItems(list);
combo->setMinimumWidth(100);
combo->adjustSize();
@@ -76,7 +76,7 @@ void UrlDlg::init_dlg()
enableButton( KDialogBase::User1, false );
connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotClear()));
urlRequester_->adjustSize();
- resize(TQSize(400,tqsizeHint().height()));
+ resize(TQSize(400,sizeHint().height()));
}
/*!
@@ -88,8 +88,8 @@ void UrlDlg::accept()
if (combo) {
combo->addToHistory(urlRequester_->url());
KConfig *kc = KGlobal::config();
- KConfigGroupSaver ks(kc, TQString::tqfromLatin1("Open-repository settings"));
- kc->writeEntry(TQString::tqfromLatin1("History"), combo->historyItems());
+ KConfigGroupSaver ks(kc, TQString::fromLatin1("Open-repository settings"));
+ kc->writeEntry(TQString::fromLatin1("History"), combo->historyItems());
kc->sync();
}
KDialogBase::accept();