TDE
/
tdesvn
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdesvn
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove the tq in front of these incorrectly TQt4-converted methods/data members:

Browse Source 
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdesvn@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 421a6fdcbe
commit 4be907152d
45 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File

20
src/kdesvn_part.cpp
Unescape View File

@ -59,21 +59,21 @@ TQString kdesvnPart::m_Extratext = "";
static const char description[] =
I18N_NOOP("A Subversion Client for KDE (dynamic Part component)");
kdesvnPart::kdesvnPart( TQWidget *tqparentWidget, const char *widgetName,
kdesvnPart::kdesvnPart( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name , const TQStringList&)
: KParts::ReadOnlyPart(tqparent, name)
{
init(tqparentWidget,widgetName,false);
init(parentWidget,widgetName,false);
}
kdesvnPart::kdesvnPart(TQWidget *tqparentWidget, const char *widgetName,
kdesvnPart::kdesvnPart(TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,bool ownapp, const TQStringList&)
: KParts::ReadOnlyPart(tqparent, name)
{
init(tqparentWidget,widgetName,ownapp);
init(parentWidget,widgetName,ownapp);
}
void kdesvnPart::init( TQWidget *tqparentWidget, const char *widgetName,bool full)
void kdesvnPart::init( TQWidget *parentWidget, const char *widgetName,bool full)
{
m_aboutDlg = 0;
KGlobal::locale()->insertCatalogue("kdesvn");
@ -82,7 +82,7 @@ void kdesvnPart::init( TQWidget *tqparentWidget, const char *widgetName,bool ful
m_browserExt = new KdesvnBrowserExtension( this );
// this should be your custom internal widget
m_view = new kdesvnView(actionCollection(),tqparentWidget,widgetName,full);
m_view = new kdesvnView(actionCollection(),parentWidget,widgetName,full);
// notify the part that this is our internal widget
setWidget(m_view);
@ -400,22 +400,22 @@ KInstance* cFactory::s_instance = 0L;
KAboutData* cFactory::s_about = 0L;
commandline_part* cFactory::s_cline = 0L;
KParts::Part* cFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
KParts::Part* cFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const char *classname, const TQStringList &args )
{
Q_UNUSED(classname);
// Create an instance of our Part
return new kdesvnPart( tqparentWidget, widgetName, tqparent, name, args );
return new kdesvnPart( parentWidget, widgetName, tqparent, name, args );
}
KParts::Part* cFactory::createAppPart( TQWidget *tqparentWidget, const char *widgetName,
KParts::Part* cFactory::createAppPart( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const char *classname, const TQStringList &args )
{
Q_UNUSED(classname);
// Create an instance of our Part
kdesvnPart* obj = new kdesvnPart( tqparentWidget, widgetName, tqparent, name, false, args);
kdesvnPart* obj = new kdesvnPart( parentWidget, widgetName, tqparent, name, false, args);
emit objectCreated( obj );
return obj;
}

10
src/kdesvn_part.h
Unescape View File

@ -51,10 +51,10 @@ public:
/**
* Default constructor
*/
kdesvnPart(TQWidget *tqparentWidget, const char *widgetName,
kdesvnPart(TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name, const TQStringList&);
kdesvnPart(TQWidget *tqparentWidget, const char *widgetName,
kdesvnPart(TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,bool ownapp, const TQStringList&);
/**
@ -82,7 +82,7 @@ protected:
virtual void setupActions();
KAboutApplication* m_aboutDlg;
void init(TQWidget *tqparentWidget, const char *widgetName,bool full);
void init(TQWidget *parentWidget, const char *widgetName,bool full);
protected slots:
virtual void slotLogFollowNodes(bool);
@ -116,10 +116,10 @@ class KDESVN_EXPORT cFactory : public KParts::Factory
public:
cFactory():KParts::Factory(){}
virtual ~cFactory();
virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const char *classname, const TQStringList &args );
virtual KParts::Part* createAppPart( TQWidget *tqparentWidget, const char *widgetName,
virtual KParts::Part* createAppPart( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const char *classname, const TQStringList &args );
virtual commandline_part*createCommandIf(TQObject*tqparent,const char*name, KCmdLineArgs *args);

8
src/kdesvnd/kdesvnd_dcop.cpp
Unescape View File

@ -127,14 +127,14 @@ TQStringList kdesvnd_dcop::getActionMenu (const KURL::List list)
TQString base;
bool tqparentIsWc = false;
bool parentIsWc = false;
bool itemIsWc = isWorkingCopy(list[0],base);
bool itemIsRepository = false;
TQString _par = list[0].directory(true,true);
tqparentIsWc = isWorkingCopy(_par,base);
parentIsWc = isWorkingCopy(_par,base);
if (!tqparentIsWc && !itemIsWc) {
if (!parentIsWc && !itemIsWc) {
itemIsRepository = isRepository(list[0]);
}
@ -151,7 +151,7 @@ TQStringList kdesvnd_dcop::getActionMenu (const KURL::List list)
<< "Commit";
}
if (!tqparentIsWc && !itemIsWc) {
if (!parentIsWc && !itemIsWc) {
if (itemIsRepository) {
result << "Log"
<< "Info";

2
src/kdesvnview.cpp
Unescape View File

@ -361,7 +361,7 @@ void kdesvnView::slotLoaddump()
}
try {
StopDlg sdlg(TQT_TQOBJECT(this),this,0,"Load Dump",i18n("Loading a dump into a repository."));
_rep.loaddump(ptr->dumpFile(),_act,ptr->tqparentPath(),ptr->usePre(),ptr->usePost());
_rep.loaddump(ptr->dumpFile(),_act,ptr->parentPath(),ptr->usePre(),ptr->usePost());
slotAppendLog(i18n("Loading dump finished."));
}catch (const svn::ClientException&e) {
slotAppendLog(e.msg());

2
src/ksvnwidgets/authdlg.ui
Unescape View File

@ -187,7 +187,7 @@
<Q_SLOTS>
<slot access="protected">slotHelp()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>

2
src/ksvnwidgets/depthform.ui
Unescape View File

@ -89,5 +89,5 @@ Equivalent to the pre-1.5 default update behavior.
</spacer>
</hbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
src/ksvnwidgets/diffbrowser.cpp
Unescape View File

@ -171,7 +171,7 @@ void DiffBrowser::doSearch(const TQString&to_find_string,bool case_sensitive,boo
m_Data->pattern=to_find_string;
break;
}
TQWidget * _tqparent = m_Data->srchdialog->isVisible()?m_Data->srchdialog:tqparentWidget();
TQWidget * _tqparent = m_Data->srchdialog->isVisible()?m_Data->srchdialog:parentWidget();
if (!m_Data->srchdialog->get_direction()) {
// forward
int query = KMessageBox::questionYesNo(

2
src/ksvnwidgets/encodingselector.ui
Unescape View File

@ -87,5 +87,5 @@
<Q_SLOTS>
<slot access="protected">itemActivated(int)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
src/ksvnwidgets/logmessage.ui
Unescape View File

@ -335,7 +335,7 @@
<slot access="protected">hideNewItems(bool)</slot>
<slot access="protected">insertFile()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="2" margin="2"/>
<layoutdefaults spacing="2" margin="2"/>
<includehints>
<includehint>ktextedit.h</includehint>
<includehint>kcombobox.h</includehint>

2
src/ksvnwidgets/logmsg_impl.cpp
Unescape View File

@ -531,7 +531,7 @@ void Logmsg_impl::slotDiffSelected()
{
SvnCheckListItem *item = static_cast<SvnCheckListItem*>(it);
TQString what = item->data()._name;
emit makeDiff(what,svn::Revision::BASE,what,svn::Revision::WORKING,tqparentWidget());
emit makeDiff(what,svn::Revision::BASE,what,svn::Revision::WORKING,parentWidget());
}
}

2
src/ksvnwidgets/revertform.ui
Unescape View File

@ -82,7 +82,7 @@
<data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>src/ksvnwidgets/depthselector.h</includehint>
</includehints>

2
src/ksvnwidgets/ssltrustprompt.ui
Unescape View File

@ -33,7 +33,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="2" margin="2"/>
<layoutdefaults spacing="2" margin="2"/>
<includehints>
<includehint>ktextbrowser.h</includehint>
</includehints>

2
src/settings/cmdexecsettings.ui
Unescape View File

@ -146,7 +146,7 @@
<Q_SLOTS>
<slot access="protected">showLogToggled(bool)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
src/settings/diffmergesettings.ui
Unescape View File

@ -242,7 +242,7 @@ When %1 and %2 is given, kdesvn let this display make the diff. For that it it m
<Q_SLOTS>
<slot access="protected">diffDispChanged(bool)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>

2
src/settings/dispcolor_settings.ui
Unescape View File

@ -244,7 +244,7 @@
<Q_SLOTS>
<slot access="protected">coloredStateToggled(bool)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>

2
src/settings/display_settings.ui
Unescape View File

@ -234,7 +234,7 @@ When kde-default is wanted for opening on double click, enter &amp;quot;default&
<slot access="protected">diffDispChanged()</slot>
<slot access="protected">dispFileInfotoggled(bool)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>klineedit.h</includehint>

2
src/settings/revisiontree_settings.ui
Unescape View File

@ -236,7 +236,7 @@
<tabstop>m_Topbottom</tabstop>
<tabstop>m_BottomTop</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>

2
src/settings/subversion_settings.ui
Unescape View File

@ -241,7 +241,7 @@ On networked repositories (eg., not opened via file:// protocol) this may get re
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
src/svnfrontend/blamedisplay.ui
Unescape View File

@ -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>

2
src/svnfrontend/copymoveview.ui
Unescape View File

@ -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>

2
src/svnfrontend/createrepo_dlg.ui
Unescape View File

@ -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>

2
src/svnfrontend/dumprepo_dlg.ui
Unescape View File

@ -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>

2
src/svnfrontend/editpropsdlg.ui
Unescape View File

@ -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>

4
src/svnfrontend/filelistviewitem.cpp
Unescape View File

@ -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)
{

2
src/svnfrontend/fronthelpers/checkoutinfo.ui
Unescape View File

@ -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>

2
src/svnfrontend/fronthelpers/rangeinput.ui
Unescape View File

@ -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>

2
src/svnfrontend/fronthelpers/revisionbutton.ui
Unescape View File

@ -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>

6
src/svnfrontend/graphtree/revgraphview.cpp
Unescape View File

@ -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 {

2
src/svnfrontend/hotcopydlg.ui
Unescape View File

@ -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>

16
src/svnfrontend/kdesvnfilelist.cpp
Unescape View File

@ -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) {

2
src/svnfrontend/loaddmpdlg.ui
Unescape View File

@ -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>

4
src/svnfrontend/loaddmpdlg_impl.cpp
Unescape View File

@ -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("/")) {

2
src/svnfrontend/loaddmpdlg_impl.h
Unescape View File

@ -33,7 +33,7 @@ public:
int uuidAction()const;
TQString dumpFile()const;
TQString repository()const;
TQString tqparentPath()const;
TQString parentPath()const;
public slots:
};

2
src/svnfrontend/merge_dlg.ui
Unescape View File

@ -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>

2
src/svnfrontend/stopdlg.cpp
Unescape View File

@ -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) {

12
src/svnfrontend/svnactions.cpp
Unescape View File

@ -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;

2
src/svnfrontend/svnlogdlg.ui
Unescape View File

@ -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>

4
src/svnfrontend/svnlogdlgimp.cpp
Unescape View File

@ -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();

4
src/svnqt/client.hpp
Unescape View File

@ -218,11 +218,11 @@ namespace svn
* @param depth if @a path is a folder add items recursive depending on value if it.
* @param force if true, do not error on already-versioned items.
* @param no_ignore if false don't add files or directories that match ignore patterns. When build against svn 1.2 always false
* @param add_tqparents if true, go up to the next versioned folder and add all between path and this folder.
* @param add_parents if true, go up to the next versioned folder and add all between path and this folder.
* @exception ClientException
*/
virtual void
add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_tqparents = true) throw (ClientException)=0;
add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_parents = true) throw (ClientException)=0;
/**
* Updates the file or directory.

4
src/svnqt/client_impl.hpp
Unescape View File

@ -189,11 +189,11 @@ namespace svn
* @param depth if @a path is a folder add items recursive depending on value if it. Pre-subversion 1.5 DepthInfinity is mapped to recursive, all other to not-recursive.
* @param force if true, do not error on already-versioned items.
* @param no_ignore if false don't add files or directories that match ignore patterns.
* @param add_tqparents if true, go up to the next versioned folder and add all between path and this folder. Used only with subversion 1.5 or newer
* @param add_parents if true, go up to the next versioned folder and add all between path and this folder. Used only with subversion 1.5 or newer
* @exception ClientException
* @sa svn::Depth
*/
virtual void add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_tqparents = true) throw (ClientException);
virtual void add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_parents = true) throw (ClientException);
/**
* Updates the file or directory.

6
src/svnqt/client_modify.cpp
Unescape View File

@ -169,7 +169,7 @@ namespace svn
void
Client_impl::add (const Path & path,
svn::Depth depth,bool force, bool no_ignore, bool add_tqparents) throw (ClientException)
svn::Depth depth,bool force, bool no_ignore, bool add_parents) throw (ClientException)
{
Pool pool;
#if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1)
@ -178,11 +178,11 @@ namespace svn
internal::DepthToSvn(depth),
force,
no_ignore,
add_tqparents,
add_parents,
*m_context,
pool);
#else
Q_UNUSED(add_tqparents);
Q_UNUSED(add_parents);
svn_error_t * error =
svn_client_add3 (path.cstr (),
depth==DepthInfinity,

4
src/svnqt/repository.cpp
Unescape View File

@ -67,7 +67,7 @@ void Repository::dump(const TQString&output,const svn::Revision&start,const svn:
}
}
void Repository::loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&tqparentFolder, bool usePre, bool usePost)throw (ClientException)
void Repository::loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&parentFolder, bool usePre, bool usePost)throw (ClientException)
{
svn_repos_load_uuid uuid_action;
switch (uuida) {
@ -82,7 +82,7 @@ void Repository::loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&tq
uuid_action=svn_repos_load_uuid_default;
break;
}
svn_error_t * error = m_Data->loaddump(dump,uuid_action,tqparentFolder,usePre,usePost);
svn_error_t * error = m_Data->loaddump(dump,uuid_action,parentFolder,usePre,usePost);
if (error!=0) {
throw ClientException (error);
}

4
src/svnqt/repository.hpp
Unescape View File

@ -93,12 +93,12 @@ public:
The repository must opened before. Progress message go trough the assigned svn::repository::RepositoryListener object.
\param dump Dumpfile to load
\param uuida what to do with UUIDs
\param tqparentFolder put content of dumpstream within folder in repository, if empty put into root-folder.
\param parentFolder put content of dumpstream within folder in repository, if empty put into root-folder.
\param usePre use pre-commit-hook
\param usePost use post-commit-hook
\exception ClientException will be thrown in case of an error
*/
void loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&tqparentFolder, bool usePre, bool usePost)throw (ClientException);
void loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&parentFolder, bool usePre, bool usePost)throw (ClientException);
//! copy a repository to a new location
/*!
\param src the repository path to copy

6
src/svnqt/repositorydata.cpp
Unescape View File

@ -209,7 +209,7 @@ svn_error_t* RepositoryData::dump(const TQString&output,const svn::Revision&star
return SVN_NO_ERROR;
}
svn_error_t* RepositoryData::loaddump(const TQString&dump,svn_repos_load_uuid uuida, const TQString&tqparentFolder, bool usePre, bool usePost)
svn_error_t* RepositoryData::loaddump(const TQString&dump,svn_repos_load_uuid uuida, const TQString&parentFolder, bool usePre, bool usePost)
{
if (!m_Repository) {
return svn_error_create(SVN_ERR_CANCELLED,0,"No repository selected.");
@ -219,10 +219,10 @@ svn_error_t* RepositoryData::loaddump(const TQString&dump,svn_repos_load_uuid uu
Pool pool;
const char*src_path = apr_pstrdup (pool,dump.TOUTF8());
const char*dest_path;
if (tqparentFolder.isEmpty()) {
if (parentFolder.isEmpty()) {
dest_path=0;
} else {
dest_path=apr_pstrdup (pool,tqparentFolder.TOUTF8());
dest_path=apr_pstrdup (pool,parentFolder.TOUTF8());
}
src_path = svn_path_internal_style(src_path, pool);

2
src/svnqt/repositorydata.hpp
Unescape View File

@ -53,7 +53,7 @@ public:
void reposFsWarning(const TQString&msg);
svn_error_t* dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas);
svn_error_t* loaddump(const TQString&dump,svn_repos_load_uuid uuida, const TQString&tqparentFolder, bool usePre, bool usePost);
svn_error_t* loaddump(const TQString&dump,svn_repos_load_uuid uuida, const TQString&parentFolder, bool usePre, bool usePost);
static svn_error_t* hotcopy(const TQString&src,const TQString&dest,bool cleanlogs);
protected:

Write Preview
Loading…
Cancel
Save