summaryrefslogtreecommitdiffstats
path: root/src/svnfrontend
diff options
context:
space:
mode:
Diffstat (limited to 'src/svnfrontend')
-rw-r--r--src/svnfrontend/blamedisplay.ui2
-rw-r--r--src/svnfrontend/copymoveview.ui2
-rw-r--r--src/svnfrontend/createrepo_dlg.ui2
-rw-r--r--src/svnfrontend/dumprepo_dlg.ui2
-rw-r--r--src/svnfrontend/editpropsdlg.ui2
-rw-r--r--src/svnfrontend/filelistviewitem.cpp4
-rw-r--r--src/svnfrontend/fronthelpers/checkoutinfo.ui2
-rw-r--r--src/svnfrontend/fronthelpers/rangeinput.ui2
-rw-r--r--src/svnfrontend/fronthelpers/revisionbutton.ui2
-rw-r--r--src/svnfrontend/graphtree/revgraphview.cpp6
-rw-r--r--src/svnfrontend/hotcopydlg.ui2
-rw-r--r--src/svnfrontend/kdesvnfilelist.cpp16
-rw-r--r--src/svnfrontend/loaddmpdlg.ui2
-rw-r--r--src/svnfrontend/loaddmpdlg_impl.cpp4
-rw-r--r--src/svnfrontend/loaddmpdlg_impl.h2
-rw-r--r--src/svnfrontend/merge_dlg.ui2
-rw-r--r--src/svnfrontend/stopdlg.cpp2
-rw-r--r--src/svnfrontend/svnactions.cpp12
-rw-r--r--src/svnfrontend/svnlogdlg.ui2
-rw-r--r--src/svnfrontend/svnlogdlgimp.cpp4
20 files changed, 37 insertions, 37 deletions
diff --git a/src/svnfrontend/blamedisplay.ui b/src/svnfrontend/blamedisplay.ui
index 35de495..4258867 100644
--- a/src/svnfrontend/blamedisplay.ui
+++ b/src/svnfrontend/blamedisplay.ui
@@ -101,7 +101,7 @@
<slot access="protected">slotContextMenuRequested(KListView*,TQListViewItem*, const QPoint&amp;)</slot>
<slot access="protected">slotItemDoubleClicked(TQListViewItem*)</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>
diff --git a/src/svnfrontend/copymoveview.ui b/src/svnfrontend/copymoveview.ui
index e51585d..3c29ac2 100644
--- a/src/svnfrontend/copymoveview.ui
+++ b/src/svnfrontend/copymoveview.ui
@@ -93,7 +93,7 @@
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="2" margin="2"/>
+<layoutdefaults spacing="2" margin="2"/>
<includehints>
<includehint>ksqueezedtextlabel.h</includehint>
<includehint>ksqueezedtextlabel.h</includehint>
diff --git a/src/svnfrontend/createrepo_dlg.ui b/src/svnfrontend/createrepo_dlg.ui
index 3f93919..552ba72 100644
--- a/src/svnfrontend/createrepo_dlg.ui
+++ b/src/svnfrontend/createrepo_dlg.ui
@@ -197,7 +197,7 @@
<slot access="protected">compatChanged13(bool)</slot>
<slot access="protected">compatChanged14(bool)</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>kurlrequester.h</includehint>
diff --git a/src/svnfrontend/dumprepo_dlg.ui b/src/svnfrontend/dumprepo_dlg.ui
index f1cabe5..e060c20 100644
--- a/src/svnfrontend/dumprepo_dlg.ui
+++ b/src/svnfrontend/dumprepo_dlg.ui
@@ -184,7 +184,7 @@
<Q_SLOTS>
<slot access="protected">slotDumpRange(bool)</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/src/svnfrontend/editpropsdlg.ui b/src/svnfrontend/editpropsdlg.ui
index e992f24..c0bab16 100644
--- a/src/svnfrontend/editpropsdlg.ui
+++ b/src/svnfrontend/editpropsdlg.ui
@@ -235,7 +235,7 @@
<slot access="protected">valueChanged()</slot>
<slot access="protected">showHelp()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp
index bb5d4d5..84754ca 100644
--- a/src/svnfrontend/filelistviewitem.cpp
+++ b/src/svnfrontend/filelistviewitem.cpp
@@ -55,8 +55,8 @@ FileListViewItem::FileListViewItem(kdesvnfilelist*_tqparent,const svn::StatusPtr
init();
}
-FileListViewItem::FileListViewItem(kdesvnfilelist*_tqparent,FileListViewItem*_tqparentItem,const svn::StatusPtr&_stat)
- : KListViewItem(_tqparentItem),SvnItem(_stat),
+FileListViewItem::FileListViewItem(kdesvnfilelist*_tqparent,FileListViewItem*_parentItem,const svn::StatusPtr&_stat)
+ : KListViewItem(_parentItem),SvnItem(_stat),
sortChar(0),
m_Ksvnfilelist(_tqparent)
{
diff --git a/src/svnfrontend/fronthelpers/checkoutinfo.ui b/src/svnfrontend/fronthelpers/checkoutinfo.ui
index 8f492cf..9334675 100644
--- a/src/svnfrontend/fronthelpers/checkoutinfo.ui
+++ b/src/svnfrontend/fronthelpers/checkoutinfo.ui
@@ -209,7 +209,7 @@
<Q_SLOTS>
<slot access="protected">urlChanged(const QString&amp;)</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="2" margin="2"/>
+<layoutdefaults spacing="2" margin="2"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/src/svnfrontend/fronthelpers/rangeinput.ui b/src/svnfrontend/fronthelpers/rangeinput.ui
index 8b6eff6..0b5e4bb 100644
--- a/src/svnfrontend/fronthelpers/rangeinput.ui
+++ b/src/svnfrontend/fronthelpers/rangeinput.ui
@@ -269,7 +269,7 @@
<slot access="protected">startDateToggled(bool)</slot>
<slot access="protected">stopDateToggled(bool)</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="2" margin="2"/>
+<layoutdefaults spacing="2" margin="2"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
diff --git a/src/svnfrontend/fronthelpers/revisionbutton.ui b/src/svnfrontend/fronthelpers/revisionbutton.ui
index c39c2bc..1ac2d25 100644
--- a/src/svnfrontend/fronthelpers/revisionbutton.ui
+++ b/src/svnfrontend/fronthelpers/revisionbutton.ui
@@ -48,7 +48,7 @@
<Q_SLOTS>
<slot>askRevision()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
</includehints>
diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp
index afb9d3a..8d2c126 100644
--- a/src/svnfrontend/graphtree/revgraphview.cpp
+++ b/src/svnfrontend/graphtree/revgraphview.cpp
@@ -58,8 +58,8 @@ protected:
void GraphViewTip::maybeTip( const TQPoint & pos)
{
- if (!tqparentWidget()->inherits( "RevGraphView" )) return;
- RevGraphView* cgv = (RevGraphView*)tqparentWidget();
+ if (!parentWidget()->inherits( "RevGraphView" )) return;
+ RevGraphView* cgv = (RevGraphView*)parentWidget();
TQPoint cPos = cgv->viewportToContents(pos);
TQCanvasItemList l = cgv->canvas()->collisions(cPos);
if (l.count() == 0) return;
@@ -326,7 +326,7 @@ void RevGraphView::dotExit(KProcess*p)
}
}
if (!m_Canvas) {
- TQString s = i18n("Error running the graph tqlayouting tool.\n");
+ TQString s = i18n("Error running the graph layouting tool.\n");
s += i18n("Please check that 'dot' is installed (package GraphViz).");
showText(s);
} else {
diff --git a/src/svnfrontend/hotcopydlg.ui b/src/svnfrontend/hotcopydlg.ui
index 59cd5e4..a226642 100644
--- a/src/svnfrontend/hotcopydlg.ui
+++ b/src/svnfrontend/hotcopydlg.ui
@@ -82,7 +82,7 @@
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/src/svnfrontend/kdesvnfilelist.cpp b/src/svnfrontend/kdesvnfilelist.cpp
index 4926baf..18a3fd6 100644
--- a/src/svnfrontend/kdesvnfilelist.cpp
+++ b/src/svnfrontend/kdesvnfilelist.cpp
@@ -2280,17 +2280,17 @@ void kdesvnfilelist::slotDiffPathes()
void kdesvnfilelist::slotMkdir()
{
SvnItem*k = singleSelected();
- TQString tqparentDir;
+ TQString parentDir;
if (k) {
if (!k->isDir()) {
KMessageBox::sorry(0,i18n("May not make subdirs of a file"));
return;
}
- tqparentDir=k->fullName();
+ parentDir=k->fullName();
} else {
- tqparentDir=baseUri();
+ parentDir=baseUri();
}
- TQString ex = m_SvnWrapper->makeMkdir(tqparentDir);
+ TQString ex = m_SvnWrapper->makeMkdir(parentDir);
if (!ex.isEmpty()) {
slotDirAdded(ex,static_cast<FileListViewItem*>(k));
}
@@ -2302,11 +2302,11 @@ void kdesvnfilelist::slotMkBaseDirs()
if (!isopen) {
return;
}
- TQString tqparentDir=baseUri();
+ TQString parentDir=baseUri();
TQStringList targets;
- targets.append(tqparentDir+"/trunk");
- targets.append(tqparentDir+"/branches");
- targets.append(tqparentDir+"/tags");
+ targets.append(parentDir+"/trunk");
+ targets.append(parentDir+"/branches");
+ targets.append(parentDir+"/tags");
TQString msg = i18n("Automatic generated base tqlayout by kdesvn");
isopen = m_SvnWrapper->makeMkdir(targets,msg);
if (isopen) {
diff --git a/src/svnfrontend/loaddmpdlg.ui b/src/svnfrontend/loaddmpdlg.ui
index 76c211d..0c4070c 100644
--- a/src/svnfrontend/loaddmpdlg.ui
+++ b/src/svnfrontend/loaddmpdlg.ui
@@ -170,7 +170,7 @@
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/src/svnfrontend/loaddmpdlg_impl.cpp b/src/svnfrontend/loaddmpdlg_impl.cpp
index 48565b4..bf53aa6 100644
--- a/src/svnfrontend/loaddmpdlg_impl.cpp
+++ b/src/svnfrontend/loaddmpdlg_impl.cpp
@@ -92,9 +92,9 @@ TQString LoadDmpDlg_impl::repository()const
/*!
- \fn LoadDmpDlg_impl::tqparentPath()const
+ \fn LoadDmpDlg_impl::parentPath()const
*/
-TQString LoadDmpDlg_impl::tqparentPath()const
+TQString LoadDmpDlg_impl::parentPath()const
{
TQString res = m_Rootfolder->text();
while (res.endsWith("/")) {
diff --git a/src/svnfrontend/loaddmpdlg_impl.h b/src/svnfrontend/loaddmpdlg_impl.h
index 2fa61ad..42baf6f 100644
--- a/src/svnfrontend/loaddmpdlg_impl.h
+++ b/src/svnfrontend/loaddmpdlg_impl.h
@@ -33,7 +33,7 @@ public:
int uuidAction()const;
TQString dumpFile()const;
TQString repository()const;
- TQString tqparentPath()const;
+ TQString parentPath()const;
public slots:
};
diff --git a/src/svnfrontend/merge_dlg.ui b/src/svnfrontend/merge_dlg.ui
index 432914c..82aea40 100644
--- a/src/svnfrontend/merge_dlg.ui
+++ b/src/svnfrontend/merge_dlg.ui
@@ -197,7 +197,7 @@
<Q_SLOTS>
<slot access="protected">externDisplayToggled(bool)</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="2" margin="2"/>
+<layoutdefaults spacing="2" margin="2"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp
index 6030b17..d2ef8f7 100644
--- a/src/svnfrontend/stopdlg.cpp
+++ b/src/svnfrontend/stopdlg.cpp
@@ -103,7 +103,7 @@ void StopDlg::slotAutoShow()
{
bool hasDialogs = false;
TQWidget * w = TQT_TQWIDGET(kapp->activeModalWidget());
- if (w && w!=this && w!=tqparentWidget() ) {
+ if (w && w!=this && w!=parentWidget() ) {
hasDialogs = true;
}
if (hasDialogs) {
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 390f480..d49f5a6 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -627,7 +627,7 @@ bool SvnActions::makeMkdir(const TQStringList&which,const TQString&logMessage)
return true;
}
-TQString SvnActions::makeMkdir(const TQString&tqparentDir)
+TQString SvnActions::makeMkdir(const TQString&parentDir)
{
if (!m_Data->m_CurrentContext) return TQString();
TQString ex;
@@ -636,7 +636,7 @@ TQString SvnActions::makeMkdir(const TQString&tqparentDir)
if (!isOk) {
return TQString();
}
- svn::Path target(tqparentDir);
+ svn::Path target(parentDir);
target.addComponent(ex);
ex = "";
@@ -858,7 +858,7 @@ void SvnActions::makeInfo(const TQStringList&lst,const svn::Revision&rev,const s
*/
void SvnActions::slotProperties()
{
- /// @todo remove reference to tqparentlist
+ /// @todo remove reference to parentlist
if (!m_Data->m_CurrentContext) return;
if (!m_Data->m_ParentList) return;
SvnItem*k = m_Data->m_ParentList->Selected();
@@ -2658,11 +2658,11 @@ void SvnActions::clearUpdateCache()
bool SvnActions::makeIgnoreEntry(SvnItem*which,bool unignore)
{
if (!which) return false;
- TQString tqparentName = which->getParentDir();
- if (tqparentName.isEmpty()) return false;
+ TQString parentName = which->getParentDir();
+ if (parentName.isEmpty()) return false;
TQString name = which->shortName();
TQString ex;
- svn::Path p(tqparentName);
+ svn::Path p(parentName);
svn::Revision r(svn_opt_revision_unspecified);
TQPair<TQLONG,svn::PathPropertiesMapList> pmp;
diff --git a/src/svnfrontend/svnlogdlg.ui b/src/svnfrontend/svnlogdlg.ui
index e775272..aba7c14 100644
--- a/src/svnfrontend/svnlogdlg.ui
+++ b/src/svnfrontend/svnlogdlg.ui
@@ -462,7 +462,7 @@
<slot access="protected">slotRevisionSelected()</slot>
<slot access="protected">slotGetLogs()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="2" margin="2"/>
+<layoutdefaults spacing="2" margin="2"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>revisionbuttonimpl.h</includehint>
diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp
index 6bc1a23..3dbfd35 100644
--- a/src/svnfrontend/svnlogdlgimp.cpp
+++ b/src/svnfrontend/svnlogdlgimp.cpp
@@ -440,7 +440,7 @@ void SvnLogDlgImp::slotDispPrevious()
*/
void SvnLogDlgImp::saveSize()
{
- int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
+ int scnum = TQApplication::desktop()->screenNumber(parentWidget());
TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
KConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName);
TQSize sizeToSave = size();
@@ -453,7 +453,7 @@ void SvnLogDlgImp::saveSize()
TQSize SvnLogDlgImp::dialogSize()
{
int w, h;
- int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
+ int scnum = TQApplication::desktop()->screenNumber(parentWidget());
TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
w = tqsizeHint().width();
h = tqsizeHint().height();