summaryrefslogtreecommitdiffstats
path: root/src/svnfrontend
diff options
context:
space:
mode:
Diffstat (limited to 'src/svnfrontend')
-rw-r--r--src/svnfrontend/blamedisplay_impl.cpp22
-rw-r--r--src/svnfrontend/ccontextlistener.cpp2
-rw-r--r--src/svnfrontend/commandexec.cpp2
-rw-r--r--src/svnfrontend/copymoveview.ui8
-rw-r--r--src/svnfrontend/createrepo_dlg.ui4
-rw-r--r--src/svnfrontend/dumprepo_dlg.ui8
-rw-r--r--src/svnfrontend/editproperty_impl.cpp4
-rw-r--r--src/svnfrontend/filelistviewitem.cpp12
-rw-r--r--src/svnfrontend/filelistviewitem.h2
-rw-r--r--src/svnfrontend/fillcachethread.cpp2
-rw-r--r--src/svnfrontend/fronthelpers/checkoutinfo.ui2
-rw-r--r--src/svnfrontend/fronthelpers/propertylist.cpp2
-rw-r--r--src/svnfrontend/graphtree/revgraphview.cpp42
-rw-r--r--src/svnfrontend/graphtree/revisiontree.cpp14
-rw-r--r--src/svnfrontend/hotcopydlg.ui4
-rw-r--r--src/svnfrontend/importdir_logmsg.cpp2
-rw-r--r--src/svnfrontend/loaddmpdlg.ui6
-rw-r--r--src/svnfrontend/merge_dlg.ui6
-rw-r--r--src/svnfrontend/stopdlg.cpp4
-rw-r--r--src/svnfrontend/svnactions.cpp16
-rw-r--r--src/svnfrontend/svnfiletip.cpp2
-rw-r--r--src/svnfrontend/svnlogdlgimp.cpp14
-rw-r--r--src/svnfrontend/tcontextlistener.cpp4
-rw-r--r--src/svnfrontend/tdesvnfilelist.cpp26
24 files changed, 105 insertions, 105 deletions
diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp
index 63913b5..dc2f028 100644
--- a/src/svnfrontend/blamedisplay_impl.cpp
+++ b/src/svnfrontend/blamedisplay_impl.cpp
@@ -100,7 +100,7 @@ public:
BlameDisplayItem(KListView*,BlameDisplayItem*,const svn::AnnotateLine&,bool,BlameDisplay_impl*);
virtual ~BlameDisplayItem(){}
virtual int compare(TQListViewItem *i, int col, bool ascending)const;
- virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
+ virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
virtual int rtti()const{return 1000;}
virtual int width( const TQFontMetrics & fm, const TQListView * lv, int c ) const;
@@ -116,7 +116,7 @@ public:
}
TQString _line = m_Content.tLine();
_line.replace("\t"," ");
- setText(COL_LINE,TQString("%1").tqarg(_line));
+ setText(COL_LINE,TQString("%1").arg(_line));
}
protected:
@@ -153,17 +153,17 @@ int BlameDisplayItem::width (const TQFontMetrics & fm, const TQListView * lv, in
void BlameDisplayItem::display()
{
if (m_disp){
- setText(COL_REV,TQString("%1").tqarg(m_Content.revision()));
+ setText(COL_REV,TQString("%1").arg(m_Content.revision()));
setText(COL_AUT,m_Content.tAuthor());
if (m_Content.date().isValid()) {
setText(COL_DATE,KGlobal::locale()->formatDateTime(m_Content.date()));
}
}
- setText(COL_LINENR,TQString("%1").tqarg(m_Content.lineNumber()+1));
+ setText(COL_LINENR,TQString("%1").arg(m_Content.lineNumber()+1));
TQString _line = m_Content.tLine();
_line.replace("\t"," ");
- setText(COL_LINE,TQString("%1").tqarg(_line));
+ setText(COL_LINE,TQString("%1").arg(_line));
}
int BlameDisplayItem::compare(TQListViewItem *item, int col, bool ascending)const
@@ -182,10 +182,10 @@ int BlameDisplayItem::compare(TQListViewItem *item, int col, bool ascending)cons
return k->m_Content.lineNumber()-m_Content.lineNumber();
}
-void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
{
- if (tqalignment & (AlignTop || AlignBottom) == 0)
- tqalignment |= AlignVCenter;
+ if (alignment & (AlignTop || AlignBottom) == 0)
+ alignment |= AlignVCenter;
/* don't copy string */
const TQString & str = text(column);;
@@ -213,7 +213,7 @@ void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum
if (str.isEmpty())
return;
- p->drawText(BORDER, 0, width - 2*BORDER, height(), tqalignment, str);
+ p->drawText(BORDER, 0, width - 2*BORDER, height(), alignment, str);
}
class BlameDisplayData
@@ -411,7 +411,7 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit)
}
KDialogBase* dlg = new KDialogBase(
TQT_TQWIDGET(KApplication::activeModalWidget()),
- "simplelog",true,TQString(i18n("Logmessage for revision %1").tqarg(bit->rev())),
+ "simplelog",true,TQString(i18n("Logmessage for revision %1").arg(bit->rev())),
KDialogBase::Close);
TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget();
KTextBrowser*ptr = new KTextBrowser(Dialog1Layout);
@@ -447,7 +447,7 @@ void BlameDisplay_impl::displayBlame(SimpleLogCb*_cb,const TQString&item,const s
int buttons = KDialogBase::Close|KDialogBase::User1|KDialogBase::User2;
KDialogBase * dlg = new KDialogBase(
TQT_TQWIDGET(KApplication::activeModalWidget()),
- name,true,TQString(i18n("Blame %1")).tqarg(item),buttons,KDialogBase::Close,false,
+ name,true,TQString(i18n("Blame %1")).arg(item),buttons,KDialogBase::Close,false,
KGuiItem(i18n("Goto line")),KGuiItem(i18n("Log message for revision"),"tdesvnlog"));
TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget();
diff --git a/src/svnfrontend/ccontextlistener.cpp b/src/svnfrontend/ccontextlistener.cpp
index 2cf3bd0..296a3bf 100644
--- a/src/svnfrontend/ccontextlistener.cpp
+++ b/src/svnfrontend/ccontextlistener.cpp
@@ -296,7 +296,7 @@ bool CContextListener::contextSslClientCertPwPrompt (TQString & password,
TQCString npass;
int keep = 1;
int res = KPasswordDialog::getPassword(npass,
- i18n("Enter password for realm %1").tqarg(realm),
+ i18n("Enter password for realm %1").arg(realm),
&keep);
emit waitShow(false);
if (res!=KPasswordDialog::Accepted) {
diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp
index 18d645e..596311b 100644
--- a/src/svnfrontend/commandexec.cpp
+++ b/src/svnfrontend/commandexec.cpp
@@ -211,7 +211,7 @@ int CommandExec::exec()
bool found = connect(this,TQT_SIGNAL(executeMe()),this,slotCmd.ascii());
if (!found) {
- slotCmd=i18n("Command \"%1\" not implemented or known").tqarg(m_pCPart->cmd);
+ slotCmd=i18n("Command \"%1\" not implemented or known").arg(m_pCPart->cmd);
KMessageBox::sorry(0,slotCmd,i18n("SVN Error"));
return -1;
}
diff --git a/src/svnfrontend/copymoveview.ui b/src/svnfrontend/copymoveview.ui
index 3c29ac2..d36fdac 100644
--- a/src/svnfrontend/copymoveview.ui
+++ b/src/svnfrontend/copymoveview.ui
@@ -26,7 +26,7 @@
<property name="text">
<string>&lt;p align="right"&gt;Rename&lt;/p&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
</widget>
@@ -37,7 +37,7 @@
<property name="text">
<string>this long text</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -48,7 +48,7 @@
<property name="text">
<string>to</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
</widget>
@@ -67,7 +67,7 @@
<property name="text">
<string>/there/</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/src/svnfrontend/createrepo_dlg.ui b/src/svnfrontend/createrepo_dlg.ui
index 552ba72..e80aab6 100644
--- a/src/svnfrontend/createrepo_dlg.ui
+++ b/src/svnfrontend/createrepo_dlg.ui
@@ -34,7 +34,7 @@
<property name="text">
<string>Type of repository:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -74,7 +74,7 @@
<property name="text">
<string>Path to repository:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/src/svnfrontend/dumprepo_dlg.ui b/src/svnfrontend/dumprepo_dlg.ui
index e060c20..aad99e6 100644
--- a/src/svnfrontend/dumprepo_dlg.ui
+++ b/src/svnfrontend/dumprepo_dlg.ui
@@ -42,7 +42,7 @@
<property name="text">
<string>Repository to dump:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -53,7 +53,7 @@
<property name="text">
<string>Dump into:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -118,7 +118,7 @@
<property name="text">
<string>End revision:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -129,7 +129,7 @@
<property name="text">
<string>Start revision:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/src/svnfrontend/editproperty_impl.cpp b/src/svnfrontend/editproperty_impl.cpp
index 00fb964..9c5ffba 100644
--- a/src/svnfrontend/editproperty_impl.cpp
+++ b/src/svnfrontend/editproperty_impl.cpp
@@ -44,7 +44,7 @@ EditProperty_impl::EditProperty_impl(TQWidget *parent, const char *name)
fileComments += i18n("If present, make the file executable.<br>"
"This property can not be set on a directory. "
"A non-recursive attempt will fail, and a recursive attempt "
- "will set the property only on the file tqchildren of the folder.");
+ "will set the property only on the file children of the folder.");
fileComments += i18n("Keywords to be expanded into the contents of a file.<br>"
"They can be inserted into documents by placing a keyword anchor "
"which is formatted as $KeywordName$.<br>"
@@ -80,7 +80,7 @@ EditProperty_impl::EditProperty_impl(TQWidget *parent, const char *name)
dirComments += i18n("If present, make the file executable.<br>"
"This property can not be set on a directory. "
"A non-recursive attempt will fail, and a recursive attempt "
- "will set the property only on the file tqchildren of the folder.");
+ "will set the property only on the file children of the folder.");
/* TRANSLATORS: Do not translate "example" in the URL because this is according
TRANSLATORS: to http://www.rfc-editor.org/rfc/rfc2606.txt a reserved URL.*/
dirComments += i18n("A newline separated list of module specifiers, each "
diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp
index da474ae..812ee69 100644
--- a/src/svnfrontend/filelistviewitem.cpp
+++ b/src/svnfrontend/filelistviewitem.cpp
@@ -144,7 +144,7 @@ void FileListViewItem::refreshStatus(bool childs,TQPtrList<SvnItem>*exclude,bool
it = static_cast<FileListViewItem*>(it->nextSibling());
}
}
- tqrepaint();
+ repaint();
}
void FileListViewItem::makePixmap()
@@ -192,7 +192,7 @@ void FileListViewItem::update()
setText(COL_STATUS,infoText());
setText(COL_LAST_AUTHOR,cmtAuthor());
setText(COL_LAST_DATE,KGlobal::locale()->formatDateTime(fullDate()));
- setText(COL_LAST_REV,TQString("%1").tqarg(cmtRev()));
+ setText(COL_LAST_REV,TQString("%1").arg(cmtRev()));
setText(COL_IS_LOCKED,lockOwner());
}
@@ -247,11 +247,11 @@ SvnItem* FileListViewItem::getParentItem()const
return temp->fullName();
}
-void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
{
bool colors = Kdesvnsettings::colored_state();
if (!colors||m_bgColor==NONE) {
- KListViewItem::paintCell(p,cg,column,width,tqalignment);
+ KListViewItem::paintCell(p,cg,column,width,alignment);
return;
}
TQColorGroup _cg = cg;
@@ -285,7 +285,7 @@ void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum
_bgColor = Kdesvnsettings::color_need_lock();
break;
default:
- KListViewItem::paintCell(p,cg,column,width,tqalignment);
+ KListViewItem::paintCell(p,cg,column,width,alignment);
return;
break;
}
@@ -301,7 +301,7 @@ void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum
_cg.setColor(TQColorGroup::Base,_bgColor);
}
}
- TQListViewItem::paintCell(p, _cg, column, width, tqalignment);
+ TQListViewItem::paintCell(p, _cg, column, width, alignment);
}
const svn::Revision&FileListViewItem::correctPeg()const
diff --git a/src/svnfrontend/filelistviewitem.h b/src/svnfrontend/filelistviewitem.h
index 6dab6e9..c1685fa 100644
--- a/src/svnfrontend/filelistviewitem.h
+++ b/src/svnfrontend/filelistviewitem.h
@@ -60,7 +60,7 @@ public:
virtual SvnItem* getParentItem()const;
virtual FileListViewItem*fItem(){return this;}
virtual void setStat(const svn::StatusPtr&);
- virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
+ virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
virtual void setOpen(bool o);
virtual void setOpenNoBlock(bool o);
diff --git a/src/svnfrontend/fillcachethread.cpp b/src/svnfrontend/fillcachethread.cpp
index e2ee7f4..92c805e 100644
--- a/src/svnfrontend/fillcachethread.cpp
+++ b/src/svnfrontend/fillcachethread.cpp
@@ -110,7 +110,7 @@ void FillCacheThread::run()
rl.fillCache(Head.revnum());
}
i=Head.revnum();
- m_SvnContextListener->contextNotify(i18n("Cache filled up to revision %1").tqarg(i));
+ m_SvnContextListener->contextNotify(i18n("Cache filled up to revision %1").arg(i));
}
} catch (const svn::Exception&e) {
m_SvnContextListener->contextNotify(e.msg());
diff --git a/src/svnfrontend/fronthelpers/checkoutinfo.ui b/src/svnfrontend/fronthelpers/checkoutinfo.ui
index 8644974..1cec475 100644
--- a/src/svnfrontend/fronthelpers/checkoutinfo.ui
+++ b/src/svnfrontend/fronthelpers/checkoutinfo.ui
@@ -64,7 +64,7 @@
<property name="text">
<string>Enter URL:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/src/svnfrontend/fronthelpers/propertylist.cpp b/src/svnfrontend/fronthelpers/propertylist.cpp
index 1b9a2d2..7dd0d9d 100644
--- a/src/svnfrontend/fronthelpers/propertylist.cpp
+++ b/src/svnfrontend/fronthelpers/propertylist.cpp
@@ -71,7 +71,7 @@ void Propertylist::displayList(const svn::PathPropertiesMapListPtr&propList,bool
}
}
viewport()->setUpdatesEnabled(true);
- viewport()->tqrepaint();
+ viewport()->repaint();
}
void Propertylist::clear()
diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp
index bb2bb3c..89d36f7 100644
--- a/src/svnfrontend/graphtree/revgraphview.cpp
+++ b/src/svnfrontend/graphtree/revgraphview.cpp
@@ -412,28 +412,28 @@ const TQString&RevGraphView::getLabelstring(const TQString&nodeName)
TQString res;
switch (it1.data().Action) {
case 'D':
- res = i18n("Deleted at revision %1").tqarg(it1.data().rev);
+ res = i18n("Deleted at revision %1").arg(it1.data().rev);
break;
case 'A':
res = i18n("Added at revision %1 as %2")
- .tqarg(it1.data().rev)
- .tqarg(it1.data().name);
+ .arg(it1.data().rev)
+ .arg(it1.data().name);
break;
case 'C':
case 1:
- res = i18n("Copied to %1 at revision %2").tqarg(it1.data().name).tqarg(it1.data().rev);
+ res = i18n("Copied to %1 at revision %2").arg(it1.data().name).arg(it1.data().rev);
break;
case 2:
- res = i18n("Renamed to %1 at revision %2").tqarg(it1.data().name).tqarg(it1.data().rev);
+ res = i18n("Renamed to %1 at revision %2").arg(it1.data().name).arg(it1.data().rev);
break;
case 'M':
- res = i18n("Modified at revision %1").tqarg(it1.data().rev);
+ res = i18n("Modified at revision %1").arg(it1.data().rev);
break;
case 'R':
- res = i18n("Replaced at revision %1").tqarg(it1.data().rev);
+ res = i18n("Replaced at revision %1").arg(it1.data().rev);
break;
default:
- res=i18n("Revision %1").tqarg(it1.data().rev);
+ res=i18n("Revision %1").arg(it1.data().rev);
break;
}
m_LabelMap[nodeName]=res;
@@ -450,7 +450,7 @@ void RevGraphView::dumpRevtree()
TQTextStream* stream = dotTmpFile->textStream();
if (!stream) {
- showText(i18n("Could not open tempfile %1 for writing.").tqarg(dotTmpFile->name()));
+ showText(i18n("Could not open tempfile %1 for writing.").arg(dotTmpFile->name()));
return;
}
@@ -481,7 +481,7 @@ void RevGraphView::dumpRevtree()
for (it1=m_Tree.begin();it1!=m_Tree.end();++it1) {
*stream << " " << it1.key()
<< "[ "
- << "tqshape=box, "
+ << "shape=box, "
<< "label=\""<<getLabelstring(it1.key())<<"\","
<< "];\n";
for (unsigned j=0;j<it1.data().targets.count();++j) {
@@ -501,9 +501,9 @@ void RevGraphView::dumpRevtree()
if (!renderProcess->start(KProcess::NotifyOnExit,KProcess::Stdout)) {
TQString arguments;
for (unsigned c=0;c<renderProcess->args().count();++c) {
- arguments+=TQString(" %1").tqarg(renderProcess->args()[c].data());
+ arguments+=TQString(" %1").arg(renderProcess->args()[c].data());
}
- TQString error = i18n("Could not start process \"%1\".").tqarg(arguments);
+ TQString error = i18n("Could not start process \"%1\".").arg(arguments);
showText(error);
renderProcess=0;
//delete renderProcess;<
@@ -542,19 +542,19 @@ TQString RevGraphView::toolTip(const TQString&_nodename,bool full)const
res = TQString("<html><body>");
if (!full) {
- res+=TQString("<b>%1</b>").tqarg(it.data().name);
+ res+=TQString("<b>%1</b>").arg(it.data().name);
res += i18n("<br>Revision: %1<br>Author: %2<br>Date: %3<br>Log: %4</html>")
- .tqarg(it.data().rev)
- .tqarg(it.data().Author)
- .tqarg(it.data().Date)
- .tqarg(sm);
+ .arg(it.data().rev)
+ .arg(it.data().Author)
+ .arg(it.data().Date)
+ .arg(sm);
} else {
res+="<table><tr><th colspan=\"2\"><b>"+it.data().name+"</b></th></tr>";
res+=rstart;
- res+=i18n("<b>Revision</b>%1%2%3").tqarg(csep).tqarg(it.data().rev).tqarg(rend);
- res+=rstart+i18n("<b>Author</b>%1%2%3").tqarg(csep).tqarg(it.data().Author).tqarg(rend);
- res+=rstart+i18n("<b>Date</b>%1%2%3").tqarg(csep).tqarg(it.data().Date).tqarg(rend);
- res+=rstart+i18n("<b>Log</b>%1%2%3").tqarg(csep).tqarg(sm).tqarg(rend);
+ res+=i18n("<b>Revision</b>%1%2%3").arg(csep).arg(it.data().rev).arg(rend);
+ res+=rstart+i18n("<b>Author</b>%1%2%3").arg(csep).arg(it.data().Author).arg(rend);
+ res+=rstart+i18n("<b>Date</b>%1%2%3").arg(csep).arg(it.data().Date).arg(rend);
+ res+=rstart+i18n("<b>Log</b>%1%2%3").arg(csep).arg(sm).arg(rend);
res+="</table></body></html>";
}
return res;
diff --git a/src/svnfrontend/graphtree/revisiontree.cpp b/src/svnfrontend/graphtree/revisiontree.cpp
index 335994e..8392566 100644
--- a/src/svnfrontend/graphtree/revisiontree.cpp
+++ b/src/svnfrontend/graphtree/revisiontree.cpp
@@ -104,13 +104,13 @@ bool RtreeData::getLogs(const TQString&reposRoot,const svn::Revision&startr,cons
} else if (Kdesvnsettings::network_on()) {
m_Client->log(reposRoot,endr,startr,m_OldHistory,startr,true,false,0);
} else {
- KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").tqarg(i18n("No logcache possible due broken database and networking not allowed.")));
+ KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").arg(i18n("No logcache possible due broken database and networking not allowed.")));
return false;
}
}
} catch (const svn::Exception&ce) {
kdDebug()<<ce.msg() << endl;
- KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").tqarg(ce.msg()));
+ KMessageBox::error(0,i18n("Could not retrieve logs, reason:\n%1").arg(ce.msg()));
return false;
}
return true;
@@ -138,7 +138,7 @@ RevisionTree::RevisionTree(svn::Client*aClient,
kdDebug()<<"Origin: "<<origin << endl;
m_Data->progress=new KProgressDialog(
- parent,"progressdlg",i18n("Scanning logs"),i18n("Scanning the logs for %1").tqarg(origin),true);
+ parent,"progressdlg",i18n("Scanning logs"),i18n("Scanning the logs for %1").arg(origin),true);
m_Data->progress->setMinimumDuration(100);
m_Data->progress->show();
m_Data->progress->setAllowCancel(true);
@@ -237,7 +237,7 @@ bool RevisionTree::topDownScan()
break;
}
label = i18n("%1<br>Check change entry %2 of %3")
- .tqarg(olabel).tqarg(i).tqarg(m_Data->m_OldHistory[j].changedPaths.count());
+ .arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count());
m_Data->progress->setLabel(label);
kapp->processEvents();
}
@@ -278,7 +278,7 @@ bool RevisionTree::topDownScan()
cancel=true;
break;
}
- label = i18n("%1<br>Check change entry %2 of %3").tqarg(olabel).tqarg(i).tqarg(m_Data->m_OldHistory[j].changedPaths.count());
+ label = i18n("%1<br>Check change entry %2 of %3").arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count());
m_Data->progress->setLabel(label);
kapp->processEvents();
}
@@ -331,7 +331,7 @@ bool RevisionTree::topDownScan()
cancel=true;
break;
}
- label = i18n("%1<br>Check change entry %2 of %3").tqarg(olabel).tqarg(i).tqarg(m_Data->m_OldHistory[j].changedPaths.count());
+ label = i18n("%1<br>Check change entry %2 of %3").arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count());
m_Data->progress->setLabel(label);
kapp->processEvents();
}
@@ -364,7 +364,7 @@ static TQString uniqueNodeName(long rev,const TQString&path)
res.replace("\"","_quot_");
res.replace(" ","_space_");
TQString n; n.sprintf("%05ld",rev);
- res = "\""+n+TQString("_%1\"").tqarg(res);
+ res = "\""+n+TQString("_%1\"").arg(res);
return res;
}
diff --git a/src/svnfrontend/hotcopydlg.ui b/src/svnfrontend/hotcopydlg.ui
index a226642..74aecee 100644
--- a/src/svnfrontend/hotcopydlg.ui
+++ b/src/svnfrontend/hotcopydlg.ui
@@ -31,7 +31,7 @@
<property name="text">
<string>Destination folder:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -58,7 +58,7 @@
<property name="text">
<string>Repository to copy:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/src/svnfrontend/importdir_logmsg.cpp b/src/svnfrontend/importdir_logmsg.cpp
index 5d3d113..c3e5eee 100644
--- a/src/svnfrontend/importdir_logmsg.cpp
+++ b/src/svnfrontend/importdir_logmsg.cpp
@@ -81,7 +81,7 @@ bool Importdir_logmsg::createDir()
void Importdir_logmsg::createDirboxDir(const TQString & which)
{
- m_createDirBox->setText(i18n("Create subdir %1 on import").tqarg(which.isEmpty()?i18n("(Last part)"):which));
+ m_createDirBox->setText(i18n("Create subdir %1 on import").arg(which.isEmpty()?i18n("(Last part)"):which));
}
#include "importdir_logmsg.moc"
diff --git a/src/svnfrontend/loaddmpdlg.ui b/src/svnfrontend/loaddmpdlg.ui
index 0c4070c..ae05cc9 100644
--- a/src/svnfrontend/loaddmpdlg.ui
+++ b/src/svnfrontend/loaddmpdlg.ui
@@ -31,7 +31,7 @@
<property name="text">
<string>Load into folder:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="toolTip" stdset="0">
@@ -48,7 +48,7 @@
<property name="text">
<string>Dump file:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -64,7 +64,7 @@
<property name="text">
<string>Load into repository:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/src/svnfrontend/merge_dlg.ui b/src/svnfrontend/merge_dlg.ui
index 728ce42..c0f5ba7 100644
--- a/src/svnfrontend/merge_dlg.ui
+++ b/src/svnfrontend/merge_dlg.ui
@@ -52,7 +52,7 @@
<property name="text">
<string>Source 1:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -68,7 +68,7 @@
<property name="text">
<string>Source 2:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -79,7 +79,7 @@
<property name="text">
<string>Output to:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp
index f5151cf..9957570 100644
--- a/src/svnfrontend/stopdlg.cpp
+++ b/src/svnfrontend/stopdlg.cpp
@@ -184,11 +184,11 @@ void StopDlg::slotNetProgres(long long int current, long long int max)
TQString s1 = helpers::ByteToString()(current);
if (max > -1 && max != m_NetBar->totalSteps()) {
TQString s2 = helpers::ByteToString()(max);
- m_NetBar->setFormat(i18n("%1 of %2").tqarg(s1).tqarg(s2));
+ m_NetBar->setFormat(i18n("%1 of %2").arg(s1).arg(s2));
m_NetBar->setTotalSteps(max);
}
if (max == -1) {
- m_NetBar->setFormat(i18n("%1 transferred.").tqarg(s1));
+ m_NetBar->setFormat(i18n("%1 transferred.").arg(s1));
m_NetBar->setTotalSteps(current+1);
}
m_NetBar->setValue(current);
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 45150d8..0cb1a3d 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -442,7 +442,7 @@ void SvnActions::makeTree(const TQString&what,const svn::Revision&_rev,const svn
}
kdDebug()<<"Logs for "<<reposRoot<<endl;
TQWidget*disp;
- KDialogBase dlg(m_Data->m_ParentList->realWidget(),"historylist",true,i18n("History of %1").tqarg(info.url().mid(reposRoot.length())),
+ KDialogBase dlg(m_Data->m_ParentList->realWidget(),"historylist",true,i18n("History of %1").arg(info.url().mid(reposRoot.length())),
KDialogBase::Ok,
KDialogBase::Ok,true);
TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget();
@@ -599,7 +599,7 @@ void SvnActions::slotMakeCat(const svn::Revision&start, const TQString&what, con
TQByteArray co = file.readAll();
if (co.size()) {
- KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Content of %1")).tqarg(disp),false,"cat_display_dlg");
+ KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Content of %1")).arg(disp),false,"cat_display_dlg");
if (dlg) {
ptr->setFont(KGlobalSettings::fixedFont());
ptr->setWordWrap(TQTextEdit::NoWrap);
@@ -1031,7 +1031,7 @@ bool SvnActions::makeCommit(const svn::Targets&targets)
return false;
}
EMIT_REFRESH;
- emit sendNotify(i18n("Committed revision %1.").tqarg(nnum.toString()));
+ emit sendNotify(i18n("Committed revision %1.").arg(nnum.toString()));
return true;
}
@@ -1232,7 +1232,7 @@ void SvnActions::makeDiffinternal(const TQString&p1,const svn::Revision&r1,const
TQByteArray ex;
KTempDir tdir;
tdir.setAutoDelete(true);
- TQString tn = TQString("%1/%2").tqarg(tdir.name()).tqarg("/svndiff");
+ TQString tn = TQString("%1/%2").arg(tdir.name()).arg("/svndiff");
bool ignore_content = Kdesvnsettings::diff_ignore_content();
TQWidget*parent = p?p:m_Data->m_ParentList->realWidget();
TQStringList extraOptions;
@@ -1296,7 +1296,7 @@ void SvnActions::makeNorecDiff(const TQString&p1,const svn::Revision&r1,const TQ
KTempDir tdir;
tdir.setAutoDelete(true);
kdDebug()<<"Non recourse diff"<<endl;
- TQString tn = TQString("%1/%2").tqarg(tdir.name()).tqarg("/svndiff");
+ TQString tn = TQString("%1/%2").arg(tdir.name()).arg("/svndiff");
bool ignore_content = Kdesvnsettings::diff_ignore_content();
try {
StopDlg sdlg(m_Data->m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),0,"Diffing","Diffing - hit cancel for abort");
@@ -1511,7 +1511,7 @@ void SvnActions::makeAdd(bool rec)
++liter;
if (cur->isVersioned()) {
KMessageBox::error(m_Data->m_ParentList->realWidget(),i18n("<center>The entry<br>%1<br>is versioned - break.</center>")
- .tqarg(cur->fullName()));
+ .arg(cur->fullName()));
return;
}
items.push_back(svn::Path(cur->fullName()));
@@ -1721,7 +1721,7 @@ void SvnActions::slotRevert()
while ((cur=liter.current())!=0){
if (!cur->isVersioned()) {
KMessageBox::error(m_Data->m_ParentList->realWidget(),i18n("<center>The entry<br>%1<br>is not versioned - break.</center>")
- .tqarg(cur->fullName()));
+ .arg(cur->fullName()));
return;
}
displist.append(cur->fullName());
@@ -2178,7 +2178,7 @@ bool SvnActions::makeMove(const TQString&Old,const TQString&New,bool force)
return false;
}
if (nnum != svn::Revision::UNDEFINED) {
- emit sendNotify(i18n("Committed revision %1.").tqarg(nnum.toString()));
+ emit sendNotify(i18n("Committed revision %1.").arg(nnum.toString()));
}
EMIT_REFRESH;
return true;
diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp
index 3513e4f..80e8877 100644
--- a/src/svnfrontend/svnfiletip.cpp
+++ b/src/svnfrontend/svnfiletip.cpp
@@ -190,7 +190,7 @@ void SvnFileTip::drawContents( TQPainter *p )
}
if ( m_corners[m_corner].isNull())
- m_corners[m_corner].load( locate( "data", TQString::fromLatin1( "konqueror/pics/%1.png" ).tqarg( names[m_corner] ) ) );
+ m_corners[m_corner].load( locate( "data", TQString::fromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) );
TQPixmap &pix = m_corners[m_corner];
diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp
index 4d45190..9cbc7e3 100644
--- a/src/svnfrontend/svnlogdlgimp.cpp
+++ b/src/svnfrontend/svnlogdlgimp.cpp
@@ -100,7 +100,7 @@ LogListViewItem::LogListViewItem(KListView*_parent,const svn::LogEntry&_entry)
setMultiLinesEnabled(false);
_revision=_entry.revision;
fullDate=svn::DateTime(_entry.date);
- setText(COL_REV,TQString("%1").tqarg(_revision));
+ setText(COL_REV,TQString("%1").arg(_revision));
setText(COL_AUTHOR,_entry.author);
setText(COL_DATE,helpers::sub2qt::apr_time2qtString(_entry.date));
_message = _entry.message;
@@ -154,7 +154,7 @@ LogChangePathItem::LogChangePathItem(KListView*parent,const svn::LogChangePathEn
_source = e.copyFromPath;
if (e.copyFromRevision>-1)
{
- setText(2,i18n("%1 at revision %2").tqarg(e.copyFromPath).tqarg(e.copyFromRevision));
+ setText(2,i18n("%1 at revision %2").arg(e.copyFromPath).arg(e.copyFromRevision));
}
}
@@ -262,7 +262,7 @@ void SvnLogDlgImp::dispLog(const svn::SharedPointer<svn::LogEntriesMap>&_log,con
m_Entries = _log;
kdDebug()<<"What: "<<what << endl;
if (!what.isEmpty()){
- setCaption(i18n("SVN Log of %1").tqarg(what));
+ setCaption(i18n("SVN Log of %1").arg(what));
} else {
setCaption(i18n("SVN Log"));
}
@@ -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::fromLatin1("Width %1").tqarg( desk.width()),
+ Kdesvnsettings::self()->config()->writeEntry( TQString::fromLatin1("Width %1").arg( desk.width()),
TQString::number( sizeToSave.width()), true, false);
- Kdesvnsettings::self()->config()->writeEntry( TQString::fromLatin1("Height %1").tqarg( desk.height()),
+ Kdesvnsettings::self()->config()->writeEntry( TQString::fromLatin1("Height %1").arg( desk.height()),
TQString::number( sizeToSave.height()), true, false);
}
@@ -458,8 +458,8 @@ TQSize SvnLogDlgImp::dialogSize()
w = sizeHint().width();
h = sizeHint().height();
KConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName);
- 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 );
+ w = Kdesvnsettings::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").arg( desk.width()), w );
+ h = Kdesvnsettings::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg( desk.height()), h );
return( TQSize( w, h ) );
}
diff --git a/src/svnfrontend/tcontextlistener.cpp b/src/svnfrontend/tcontextlistener.cpp
index 53d7892..486af86 100644
--- a/src/svnfrontend/tcontextlistener.cpp
+++ b/src/svnfrontend/tcontextlistener.cpp
@@ -188,9 +188,9 @@ void ThreadContextListener::contextProgress(long long int current, long long int
TQString s1 = helpers::ByteToString()(current);
if (max>-1) {
TQString s2 = helpers::ByteToString()(max);
- msg = i18n("%1 of %2 transferred.").tqarg(s1).tqarg(s2);
+ msg = i18n("%1 of %2 transferred.").arg(s1).arg(s2);
} else {
- msg = i18n("%1 transferred.").tqarg(s1);
+ msg = i18n("%1 transferred.").arg(s1);
}
_notify->msg = msg;
ev->setData((void*)_notify);
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index dc0b7c0..2429d70 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -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();
}*/
@@ -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()));
}
}
}
@@ -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)
@@ -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();
}
}
@@ -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);
}
}
@@ -2600,7 +2600,7 @@ void tdesvnfilelist::_dirwatchTimeout()
m_pList->dirItems.clear();
viewport()->setUpdatesEnabled(true);
if (repaintit) {
-// viewport()->tqrepaint();
+// viewport()->repaint();
}
}
@@ -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);
@@ -3087,8 +3087,8 @@ void tdesvnfilelist::slotUnfoldTree()
}
setFocus();
setUpdatesEnabled(true);
- viewport()->tqrepaint();
- tqrepaint();
+ viewport()->repaint();
+ repaint();
m_SvnWrapper->slotCancel(false);
}