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

Fix a number of build failures

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 28972708f2
commit faca9d4026
29 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File

2
src/helpers/sub2qt.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/ ***************************************************************************/
#include "sub2qt.h" #include "sub2qt.h"
#include "src/svnqt/datetime.hpp" #include "datetime.hpp"
#include "kglobal.h" #include "kglobal.h"
#include "klocale.h" #include "klocale.h"
#include <tqmap.h> #include <tqmap.h>

2
src/ksvnwidgets/authdialogimpl.cpp
Unescape View File

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include "authdialogimpl.h" #include "authdialogimpl.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include <kpassdlg.h> #include <kpassdlg.h>
#include <klineedit.h> #include <klineedit.h>

2
src/ksvnwidgets/authdialogimpl.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef AUTHDIALOGIMPL_H #ifndef AUTHDIALOGIMPL_H
#define AUTHDIALOGIMPL_H #define AUTHDIALOGIMPL_H
#include "src/ksvnwidgets/authdlg.h" #include "authdlg.h"
#include <tqstring.h> #include <tqstring.h>
class AuthDialogImpl: public AuthDialogData { class AuthDialogImpl: public AuthDialogData {

2
src/ksvnwidgets/depthselector.cpp
Unescape View File

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include "depthselector.h" #include "depthselector.h"
#include "src/svnqt/version_check.hpp" #include "version_check.hpp"
#include <klocale.h> #include <klocale.h>

4
src/ksvnwidgets/depthselector.h
Unescape View File

@ -20,9 +20,9 @@
#ifndef DEPTHSELECTOR_H #ifndef DEPTHSELECTOR_H
#define DEPTHSELECTOR_H #define DEPTHSELECTOR_H
#include "src/ksvnwidgets/depthform.h" #include "depthform.h"
#include "src/svnqt/svnqttypes.hpp" #include "svnqttypes.hpp"
class TQCheckBox; class TQCheckBox;

4
src/ksvnwidgets/diffbrowser.cpp
Unescape View File

@ -20,7 +20,7 @@
#include "diffbrowser.h" #include "diffbrowser.h"
#include "diffbrowserdata.h" #include "diffbrowserdata.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kglobal.h> #include <kglobal.h>
@ -76,7 +76,7 @@ void DiffBrowser::setText(const TQByteArray&aText)
void DiffBrowser::printContent() void DiffBrowser::printContent()
{ {
TQTextCodec * cc = TQTextCodec::codecForName(Kdesvnsettings::locale_for_diff()); TQTextCodec * cc = TQTextCodec::codecForName(Kdesvnsettings::locale_for_diff().ascii());
if (!cc) { if (!cc) {
KTextBrowser::setText(TQString::fromLocal8Bit(m_Data->m_content,m_Data->m_content.size())); KTextBrowser::setText(TQString::fromLocal8Bit(m_Data->m_content,m_Data->m_content.size()));
} else { } else {

4
src/ksvnwidgets/diffsyntax.cpp
Unescape View File

@ -47,12 +47,12 @@ int DiffSyntax::highlightParagraph ( const TQString & aText, int endStateOfLastP
if (endStateOfLastPara == 1) { if (endStateOfLastPara == 1) {
ret = 2; ret = 2;
} else if (endStateOfLastPara == 2) { } else if (endStateOfLastPara == 2) {
if (b.match(aText)!=0) { if (b.search(aText)!=0) {
ret = 2; ret = 2;
} }
} }
if (a.match(aText)>-1) { if (a.search(aText)>-1) {
c = TQColor("#660033"); c = TQColor("#660033");
if (endStateOfLastPara==1||endStateOfLastPara==2) { if (endStateOfLastPara==1||endStateOfLastPara==2) {
f.setBold(true); f.setBold(true);

2
src/ksvnwidgets/encodingselector_impl.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef LOCALESELECTOR_IMPL_H #ifndef LOCALESELECTOR_IMPL_H
#define LOCALESELECTOR_IMPL_H #define LOCALESELECTOR_IMPL_H
#include "src/ksvnwidgets/encodingselector.h" #include "encodingselector.h"
class TQTextCodec; class TQTextCodec;

4
src/ksvnwidgets/logmessage.ui
Unescape View File

@ -268,7 +268,7 @@
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>DepthSelector</class> <class>DepthSelector</class>
<header location="local">src/ksvnwidgets/depthselector.h</header> <header location="local">depthselector.h</header>
<sizehint> <sizehint>
<width>-1</width> <width>-1</width>
<height>30</height> <height>30</height>
@ -339,6 +339,6 @@
<includehints> <includehints>
<includehint>ktextedit.h</includehint> <includehint>ktextedit.h</includehint>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>
<includehint>src/ksvnwidgets/depthselector.h</includehint> <includehint>depthselector.h</includehint>
</includehints> </includehints>
</UI> </UI>

2
src/ksvnwidgets/logmsg_impl.cpp
Unescape View File

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include "logmsg_impl.h" #include "logmsg_impl.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include "depthselector.h" #include "depthselector.h"
#include <ktextedit.h> #include <ktextedit.h>

4
src/ksvnwidgets/logmsg_impl.h
Unescape View File

@ -20,8 +20,8 @@
#ifndef LOGMSG_IMPL_H #ifndef LOGMSG_IMPL_H
#define LOGMSG_IMPL_H #define LOGMSG_IMPL_H
#include "src/ksvnwidgets/logmessage.h" #include "logmessage.h"
#include "src/svnqt/commititem.hpp" #include "commititem.hpp"
#include <tqvaluelist.h> #include <tqvaluelist.h>
#include <tqpair.h> #include <tqpair.h>

4
src/ksvnwidgets/revertform.ui
Unescape View File

@ -62,7 +62,7 @@
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>DepthSelector</class> <class>DepthSelector</class>
<header location="local">src/ksvnwidgets/depthselector.h</header> <header location="local">depthselector.h</header>
<sizehint> <sizehint>
<width>-1</width> <width>-1</width>
<height>30</height> <height>30</height>
@ -84,6 +84,6 @@
</images> </images>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>src/ksvnwidgets/depthselector.h</includehint> <includehint>depthselector.h</includehint>
</includehints> </includehints>
</UI> </UI>

4
src/ksvnwidgets/revertform_impl.h
Unescape View File

@ -20,8 +20,8 @@
#ifndef _REVERT_FORM_IMPL_H #ifndef _REVERT_FORM_IMPL_H
#define _REVERT_FORM_IMPL_H #define _REVERT_FORM_IMPL_H
#include "src/ksvnwidgets/revertform.h" #include "revertform.h"
#include "src/svnqt/svnqttypes.hpp" #include "svnqttypes.hpp"
class TQStringList; class TQStringList;

2
src/ksvnwidgets/ssltrustprompt_impl.cpp
Unescape View File

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include "ssltrustprompt_impl.h" #include "ssltrustprompt_impl.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include <klocale.h> #include <klocale.h>
#include <tqlabel.h> #include <tqlabel.h>

2
src/ksvnwidgets/ssltrustprompt_impl.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef SSLTRUSTPROMPT_IMPL_H #ifndef SSLTRUSTPROMPT_IMPL_H
#define SSLTRUSTPROMPT_IMPL_H #define SSLTRUSTPROMPT_IMPL_H
#include "src/ksvnwidgets/ssltrustprompt.h" #include "ssltrustprompt.h"
class SslTrustPrompt_impl: public SslTrustPrompt { class SslTrustPrompt_impl: public SslTrustPrompt {
Q_OBJECT Q_OBJECT

2
src/settings/diffmergesettings_impl.cpp
Unescape View File

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include "diffmergesettings_impl.h" #include "diffmergesettings_impl.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include <tqbuttongroup.h> #include <tqbuttongroup.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>

2
src/settings/displaysettings_impl.cpp
Unescape View File

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include "displaysettings_impl.h" #include "displaysettings_impl.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include <tqbuttongroup.h> #include <tqbuttongroup.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>

2
src/settings/revisiontreesettingsdlg_impl.cpp
Unescape View File

@ -17,7 +17,7 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include "src/settings/revisiontreesettingsdlg_impl.h" #include "revisiontreesettingsdlg_impl.h"
RevisiontreeSettingsDlg_impl::RevisiontreeSettingsDlg_impl(TQWidget *parent, const char *name) RevisiontreeSettingsDlg_impl::RevisiontreeSettingsDlg_impl(TQWidget *parent, const char *name)
:RevisiontreeSettingsDlg(parent, name) :RevisiontreeSettingsDlg(parent, name)

16
src/svnfrontend/ccontextlistener.cpp
Unescape View File

@ -18,11 +18,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include "ccontextlistener.h" #include "ccontextlistener.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include "src/ksvnwidgets/authdialogimpl.h" #include "authdialogimpl.h"
#include "src/ksvnwidgets/logmsg_impl.h" #include "logmsg_impl.h"
#include "src/ksvnwidgets/ssltrustprompt_impl.h" #include "ssltrustprompt_impl.h"
#include "src/ksvnwidgets/pwstorage.h" #include "pwstorage.h"
#include <klocale.h> #include <klocale.h>
#include <kapp.h> #include <kapp.h>
@ -104,13 +104,13 @@ TQString CContextListener::NotifyAction(svn_wc_notify_action_t action)
if (action>=smax_actionstring||action<0) { if (action>=smax_actionstring||action<0) {
return TQString(); return TQString();
} }
return action_strings[action].isEmpty()?TQString():i18n(action_strings[action]); return action_strings[action].isEmpty()?TQString():i18n(action_strings[action].ascii());
} }
TQString CContextListener::NotifyState(svn_wc_notify_state_t state) TQString CContextListener::NotifyState(svn_wc_notify_state_t state)
{ {
if (state > svn_wc_notify_state_conflicted || state<0) return TQString(); if (state > svn_wc_notify_state_conflicted || state<0) return TQString();
return notify_state_strings[state].isEmpty()?TQString():i18n(notify_state_strings[state]); return notify_state_strings[state].isEmpty()?TQString():i18n(notify_state_strings[state].ascii());
} }
CContextListener::CContextListener(TQObject *parent, const char *name) CContextListener::CContextListener(TQObject *parent, const char *name)
@ -339,7 +339,7 @@ TQStringList CContextListener::failure2Strings(apr_uint32_t acceptedFailures)
TQString CContextListener::translate(const TQString&what) TQString CContextListener::translate(const TQString&what)
{ {
return i18n(what); return i18n(what.ascii());
} }
/*! /*!

4
src/svnfrontend/ccontextlistener.h
Unescape View File

@ -20,8 +20,8 @@
#ifndef CCONTEXTLISTENER_H #ifndef CCONTEXTLISTENER_H
#define CCONTEXTLISTENER_H #define CCONTEXTLISTENER_H
#include "src/svnqt/context_listener.hpp" #include "context_listener.hpp"
#include "src/svnqt/smart_pointer.hpp" #include "smart_pointer.hpp"
#include <tqobject.h> #include <tqobject.h>
#include <tqstring.h> #include <tqstring.h>

22
src/svnfrontend/commandexec.cpp
Unescape View File

@ -18,17 +18,17 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include "commandexec.h" #include "commandexec.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include "svnfrontend/svnactions.h" #include "svnactions.h"
#include "svnfrontend/dummydisplay.h" #include "dummydisplay.h"
#include "src/svnqt/targets.hpp" #include "targets.hpp"
#include "src/svnqt/url.hpp" #include "url.hpp"
#include "src/svnqt/dirent.hpp" #include "dirent.hpp"
#include "src/helpers/sub2qt.h" #include "sub2qt.h"
#include "src/helpers/ktranslateurl.h" #include "ktranslateurl.h"
#include "src/helpers/sshagent.h" #include "sshagent.h"
#include "src/svnfrontend/fronthelpers/rangeinput_impl.h" #include "rangeinput_impl.h"
#include "src/svnfrontend/copymoveview_impl.h" #include "copymoveview_impl.h"
#include <kapp.h> #include <kapp.h>
#include <kglobal.h> #include <kglobal.h>

12
src/svnfrontend/filelistviewitem.cpp
Unescape View File

@ -19,13 +19,13 @@
***************************************************************************/ ***************************************************************************/
#include "filelistviewitem.h" #include "filelistviewitem.h"
#include "tdesvnfilelist.h" #include "tdesvnfilelist.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include "helpers/sub2qt.h" #include "helpers/sub2qt.h"
#include "src/svnqt/status.hpp" #include "status.hpp"
#include "src/svnqt/revision.hpp" #include "revision.hpp"
#include "src/svnqt/exception.hpp" #include "exception.hpp"
#include "src/svnqt/url.hpp" #include "url.hpp"
#include "fronthelpers/widgetblockstack.h" #include "widgetblockstack.h"
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>

6
src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp
Unescape View File

@ -19,9 +19,9 @@
***************************************************************************/ ***************************************************************************/
#include "checkoutinfo_impl.h" #include "checkoutinfo_impl.h"
#include "rangeinput_impl.h" #include "rangeinput_impl.h"
#include "src/ksvnwidgets/depthselector.h" #include "depthselector.h"
#include "src/svnqt/url.hpp" #include "url.hpp"
#include "helpers/ktranslateurl.h" #include "ktranslateurl.h"
#include <kurlrequester.h> #include <kurlrequester.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqtooltip.h> #include <tqtooltip.h>

4
src/svnfrontend/fronthelpers/checkoutinfo_impl.h
Unescape View File

@ -21,8 +21,8 @@
#define CHECKOUTINFO_IMPL_H #define CHECKOUTINFO_IMPL_H
#include "checkoutinfo.h" #include "checkoutinfo.h"
#include "src/svnqt/revision.hpp" #include "revision.hpp"
#include "src/svnqt/svnqttypes.hpp" #include "svnqttypes.hpp"
#include "kurl.h" #include "kurl.h"
class CheckoutInfo_impl: public CheckoutInfo { class CheckoutInfo_impl: public CheckoutInfo {

2
src/svnfrontend/fronthelpers/propertylist.cpp
Unescape View File

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include "propertylist.h" #include "propertylist.h"
#include "src/svnfrontend/fronthelpers/propertyitem.h" #include "propertyitem.h"
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>

2
src/svnfrontend/fronthelpers/rangeinput_impl.h
Unescape View File

@ -21,7 +21,7 @@
#define RANGEINPUT_IMPL_H #define RANGEINPUT_IMPL_H
#include "rangeinput.h" #include "rangeinput.h"
#include "src/svnqt/revision.hpp" #include "revision.hpp"
#include <tqpair.h> #include <tqpair.h>
class Rangeinput_impl: public RangeInputDlg { class Rangeinput_impl: public RangeInputDlg {

4
src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp
Unescape View File

@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include "revisionbuttonimpl.h" #include "revisionbuttonimpl.h"
#include "src/svnfrontend/fronthelpers/rangeinput_impl.h" #include "rangeinput_impl.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kdialog.h> #include <kdialog.h>

2
src/svnfrontend/graphtree/graphtreelabel.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef GRAPHTREELABEL_H #ifndef GRAPHTREELABEL_H
#define GRAPHTREELABEL_H #define GRAPHTREELABEL_H
#include "graphtree/drawparams.h" #include "drawparams.h"
#include <tqcanvas.h> #include <tqcanvas.h>
/** /**

10
src/svnfrontend/svnactions.h
Unescape View File

@ -20,11 +20,11 @@
#ifndef SVNACTIONS_H #ifndef SVNACTIONS_H
#define SVNACTIONS_H #define SVNACTIONS_H
#include "src/svnqt/client.hpp" #include "client.hpp"
#include "src/svnqt/revision.hpp" #include "revision.hpp"
#include "src/svnqt/smart_pointer.hpp" #include "smart_pointer.hpp"
#include "src/svnqt/shared_pointer.hpp" #include "shared_pointer.hpp"
#include "src/svnqt/svnqttypes.hpp" #include "svnqttypes.hpp"
#include "simple_logcb.h" #include "simple_logcb.h"

Write Preview
Loading…
Cancel
Save