From faca9d40261b2045c221b6e0a411a1e0c8f462bc Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Nov 2011 01:51:51 -0600 Subject: [PATCH] Fix a number of build failures --- src/helpers/sub2qt.cpp | 2 +- src/ksvnwidgets/authdialogimpl.cpp | 2 +- src/ksvnwidgets/authdialogimpl.h | 2 +- src/ksvnwidgets/depthselector.cpp | 2 +- src/ksvnwidgets/depthselector.h | 4 ++-- src/ksvnwidgets/diffbrowser.cpp | 4 ++-- src/ksvnwidgets/diffsyntax.cpp | 4 ++-- src/ksvnwidgets/encodingselector_impl.h | 2 +- src/ksvnwidgets/logmessage.ui | 4 ++-- src/ksvnwidgets/logmsg_impl.cpp | 2 +- src/ksvnwidgets/logmsg_impl.h | 4 ++-- src/ksvnwidgets/revertform.ui | 4 ++-- src/ksvnwidgets/revertform_impl.h | 4 ++-- src/ksvnwidgets/ssltrustprompt_impl.cpp | 2 +- src/ksvnwidgets/ssltrustprompt_impl.h | 2 +- src/settings/diffmergesettings_impl.cpp | 2 +- src/settings/displaysettings_impl.cpp | 2 +- src/settings/revisiontreesettingsdlg_impl.cpp | 2 +- src/svnfrontend/ccontextlistener.cpp | 16 +++++++------- src/svnfrontend/ccontextlistener.h | 4 ++-- src/svnfrontend/commandexec.cpp | 22 +++++++++---------- src/svnfrontend/filelistviewitem.cpp | 12 +++++----- .../fronthelpers/checkoutinfo_impl.cpp | 6 ++--- .../fronthelpers/checkoutinfo_impl.h | 4 ++-- src/svnfrontend/fronthelpers/propertylist.cpp | 2 +- .../fronthelpers/rangeinput_impl.h | 2 +- .../fronthelpers/revisionbuttonimpl.cpp | 4 ++-- src/svnfrontend/graphtree/graphtreelabel.h | 2 +- src/svnfrontend/svnactions.h | 10 ++++----- 29 files changed, 67 insertions(+), 67 deletions(-) diff --git a/src/helpers/sub2qt.cpp b/src/helpers/sub2qt.cpp index 77c7e66..abe699c 100644 --- a/src/helpers/sub2qt.cpp +++ b/src/helpers/sub2qt.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "sub2qt.h" -#include "src/svnqt/datetime.hpp" +#include "datetime.hpp" #include "kglobal.h" #include "klocale.h" #include diff --git a/src/ksvnwidgets/authdialogimpl.cpp b/src/ksvnwidgets/authdialogimpl.cpp index 0292f81..f445e78 100644 --- a/src/ksvnwidgets/authdialogimpl.cpp +++ b/src/ksvnwidgets/authdialogimpl.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "authdialogimpl.h" -#include "src/settings/tdesvnsettings.h" +#include "tdesvnsettings.h" #include #include diff --git a/src/ksvnwidgets/authdialogimpl.h b/src/ksvnwidgets/authdialogimpl.h index 1fba3f2..20216c4 100644 --- a/src/ksvnwidgets/authdialogimpl.h +++ b/src/ksvnwidgets/authdialogimpl.h @@ -20,7 +20,7 @@ #ifndef AUTHDIALOGIMPL_H #define AUTHDIALOGIMPL_H -#include "src/ksvnwidgets/authdlg.h" +#include "authdlg.h" #include class AuthDialogImpl: public AuthDialogData { diff --git a/src/ksvnwidgets/depthselector.cpp b/src/ksvnwidgets/depthselector.cpp index 6ebebd0..6e9bb74 100644 --- a/src/ksvnwidgets/depthselector.cpp +++ b/src/ksvnwidgets/depthselector.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "depthselector.h" -#include "src/svnqt/version_check.hpp" +#include "version_check.hpp" #include diff --git a/src/ksvnwidgets/depthselector.h b/src/ksvnwidgets/depthselector.h index ecbe8fa..dc1b74c 100644 --- a/src/ksvnwidgets/depthselector.h +++ b/src/ksvnwidgets/depthselector.h @@ -20,9 +20,9 @@ #ifndef DEPTHSELECTOR_H #define DEPTHSELECTOR_H -#include "src/ksvnwidgets/depthform.h" +#include "depthform.h" -#include "src/svnqt/svnqttypes.hpp" +#include "svnqttypes.hpp" class TQCheckBox; diff --git a/src/ksvnwidgets/diffbrowser.cpp b/src/ksvnwidgets/diffbrowser.cpp index 2d9b39c..1e87d29 100644 --- a/src/ksvnwidgets/diffbrowser.cpp +++ b/src/ksvnwidgets/diffbrowser.cpp @@ -20,7 +20,7 @@ #include "diffbrowser.h" #include "diffbrowserdata.h" -#include "src/settings/tdesvnsettings.h" +#include "tdesvnsettings.h" #include #include @@ -76,7 +76,7 @@ void DiffBrowser::setText(const TQByteArray&aText) void DiffBrowser::printContent() { - TQTextCodec * cc = TQTextCodec::codecForName(Kdesvnsettings::locale_for_diff()); + TQTextCodec * cc = TQTextCodec::codecForName(Kdesvnsettings::locale_for_diff().ascii()); if (!cc) { KTextBrowser::setText(TQString::fromLocal8Bit(m_Data->m_content,m_Data->m_content.size())); } else { diff --git a/src/ksvnwidgets/diffsyntax.cpp b/src/ksvnwidgets/diffsyntax.cpp index 9f5e573..77d2381 100644 --- a/src/ksvnwidgets/diffsyntax.cpp +++ b/src/ksvnwidgets/diffsyntax.cpp @@ -47,12 +47,12 @@ int DiffSyntax::highlightParagraph ( const TQString & aText, int endStateOfLastP if (endStateOfLastPara == 1) { ret = 2; } else if (endStateOfLastPara == 2) { - if (b.match(aText)!=0) { + if (b.search(aText)!=0) { ret = 2; } } - if (a.match(aText)>-1) { + if (a.search(aText)>-1) { c = TQColor("#660033"); if (endStateOfLastPara==1||endStateOfLastPara==2) { f.setBold(true); diff --git a/src/ksvnwidgets/encodingselector_impl.h b/src/ksvnwidgets/encodingselector_impl.h index 328935b..837bdc7 100644 --- a/src/ksvnwidgets/encodingselector_impl.h +++ b/src/ksvnwidgets/encodingselector_impl.h @@ -20,7 +20,7 @@ #ifndef LOCALESELECTOR_IMPL_H #define LOCALESELECTOR_IMPL_H -#include "src/ksvnwidgets/encodingselector.h" +#include "encodingselector.h" class TQTextCodec; diff --git a/src/ksvnwidgets/logmessage.ui b/src/ksvnwidgets/logmessage.ui index 786a19e..2199705 100644 --- a/src/ksvnwidgets/logmessage.ui +++ b/src/ksvnwidgets/logmessage.ui @@ -268,7 +268,7 @@ DepthSelector -
src/ksvnwidgets/depthselector.h
+
depthselector.h
-1 30 @@ -339,6 +339,6 @@ ktextedit.h kcombobox.h - src/ksvnwidgets/depthselector.h + depthselector.h diff --git a/src/ksvnwidgets/logmsg_impl.cpp b/src/ksvnwidgets/logmsg_impl.cpp index a5b7fc8..283ae2b 100644 --- a/src/ksvnwidgets/logmsg_impl.cpp +++ b/src/ksvnwidgets/logmsg_impl.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "logmsg_impl.h" -#include "src/settings/tdesvnsettings.h" +#include "tdesvnsettings.h" #include "depthselector.h" #include diff --git a/src/ksvnwidgets/logmsg_impl.h b/src/ksvnwidgets/logmsg_impl.h index ef92258..6d86e89 100644 --- a/src/ksvnwidgets/logmsg_impl.h +++ b/src/ksvnwidgets/logmsg_impl.h @@ -20,8 +20,8 @@ #ifndef LOGMSG_IMPL_H #define LOGMSG_IMPL_H -#include "src/ksvnwidgets/logmessage.h" -#include "src/svnqt/commititem.hpp" +#include "logmessage.h" +#include "commititem.hpp" #include #include diff --git a/src/ksvnwidgets/revertform.ui b/src/ksvnwidgets/revertform.ui index bf99a45..1f413dc 100644 --- a/src/ksvnwidgets/revertform.ui +++ b/src/ksvnwidgets/revertform.ui @@ -62,7 +62,7 @@ DepthSelector -
src/ksvnwidgets/depthselector.h
+
depthselector.h
-1 30 @@ -84,6 +84,6 @@ - src/ksvnwidgets/depthselector.h + depthselector.h diff --git a/src/ksvnwidgets/revertform_impl.h b/src/ksvnwidgets/revertform_impl.h index 6e6eed0..44e7478 100644 --- a/src/ksvnwidgets/revertform_impl.h +++ b/src/ksvnwidgets/revertform_impl.h @@ -20,8 +20,8 @@ #ifndef _REVERT_FORM_IMPL_H #define _REVERT_FORM_IMPL_H -#include "src/ksvnwidgets/revertform.h" -#include "src/svnqt/svnqttypes.hpp" +#include "revertform.h" +#include "svnqttypes.hpp" class TQStringList; diff --git a/src/ksvnwidgets/ssltrustprompt_impl.cpp b/src/ksvnwidgets/ssltrustprompt_impl.cpp index fcd4090..1791e80 100644 --- a/src/ksvnwidgets/ssltrustprompt_impl.cpp +++ b/src/ksvnwidgets/ssltrustprompt_impl.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "ssltrustprompt_impl.h" -#include "src/settings/tdesvnsettings.h" +#include "tdesvnsettings.h" #include #include diff --git a/src/ksvnwidgets/ssltrustprompt_impl.h b/src/ksvnwidgets/ssltrustprompt_impl.h index 4c6a5b1..bf8df16 100644 --- a/src/ksvnwidgets/ssltrustprompt_impl.h +++ b/src/ksvnwidgets/ssltrustprompt_impl.h @@ -20,7 +20,7 @@ #ifndef SSLTRUSTPROMPT_IMPL_H #define SSLTRUSTPROMPT_IMPL_H -#include "src/ksvnwidgets/ssltrustprompt.h" +#include "ssltrustprompt.h" class SslTrustPrompt_impl: public SslTrustPrompt { Q_OBJECT diff --git a/src/settings/diffmergesettings_impl.cpp b/src/settings/diffmergesettings_impl.cpp index 997dffc..5f09d67 100644 --- a/src/settings/diffmergesettings_impl.cpp +++ b/src/settings/diffmergesettings_impl.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "diffmergesettings_impl.h" -#include "src/settings/tdesvnsettings.h" +#include "tdesvnsettings.h" #include #include diff --git a/src/settings/displaysettings_impl.cpp b/src/settings/displaysettings_impl.cpp index d2cdc0c..7ab70a2 100644 --- a/src/settings/displaysettings_impl.cpp +++ b/src/settings/displaysettings_impl.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "displaysettings_impl.h" -#include "src/settings/tdesvnsettings.h" +#include "tdesvnsettings.h" #include #include diff --git a/src/settings/revisiontreesettingsdlg_impl.cpp b/src/settings/revisiontreesettingsdlg_impl.cpp index 5162d76..baff00e 100644 --- a/src/settings/revisiontreesettingsdlg_impl.cpp +++ b/src/settings/revisiontreesettingsdlg_impl.cpp @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., * * 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(parent, name) diff --git a/src/svnfrontend/ccontextlistener.cpp b/src/svnfrontend/ccontextlistener.cpp index a27e68f..2cf3bd0 100644 --- a/src/svnfrontend/ccontextlistener.cpp +++ b/src/svnfrontend/ccontextlistener.cpp @@ -18,11 +18,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "ccontextlistener.h" -#include "src/settings/tdesvnsettings.h" -#include "src/ksvnwidgets/authdialogimpl.h" -#include "src/ksvnwidgets/logmsg_impl.h" -#include "src/ksvnwidgets/ssltrustprompt_impl.h" -#include "src/ksvnwidgets/pwstorage.h" +#include "tdesvnsettings.h" +#include "authdialogimpl.h" +#include "logmsg_impl.h" +#include "ssltrustprompt_impl.h" +#include "pwstorage.h" #include #include @@ -104,13 +104,13 @@ TQString CContextListener::NotifyAction(svn_wc_notify_action_t action) if (action>=smax_actionstring||action<0) { 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) { 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) @@ -339,7 +339,7 @@ TQStringList CContextListener::failure2Strings(apr_uint32_t acceptedFailures) TQString CContextListener::translate(const TQString&what) { - return i18n(what); + return i18n(what.ascii()); } /*! diff --git a/src/svnfrontend/ccontextlistener.h b/src/svnfrontend/ccontextlistener.h index 9508068..1eb1659 100644 --- a/src/svnfrontend/ccontextlistener.h +++ b/src/svnfrontend/ccontextlistener.h @@ -20,8 +20,8 @@ #ifndef CCONTEXTLISTENER_H #define CCONTEXTLISTENER_H -#include "src/svnqt/context_listener.hpp" -#include "src/svnqt/smart_pointer.hpp" +#include "context_listener.hpp" +#include "smart_pointer.hpp" #include #include diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp index ab557d2..431125c 100644 --- a/src/svnfrontend/commandexec.cpp +++ b/src/svnfrontend/commandexec.cpp @@ -18,17 +18,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "commandexec.h" -#include "src/settings/tdesvnsettings.h" -#include "svnfrontend/svnactions.h" -#include "svnfrontend/dummydisplay.h" -#include "src/svnqt/targets.hpp" -#include "src/svnqt/url.hpp" -#include "src/svnqt/dirent.hpp" -#include "src/helpers/sub2qt.h" -#include "src/helpers/ktranslateurl.h" -#include "src/helpers/sshagent.h" -#include "src/svnfrontend/fronthelpers/rangeinput_impl.h" -#include "src/svnfrontend/copymoveview_impl.h" +#include "tdesvnsettings.h" +#include "svnactions.h" +#include "dummydisplay.h" +#include "targets.hpp" +#include "url.hpp" +#include "dirent.hpp" +#include "sub2qt.h" +#include "ktranslateurl.h" +#include "sshagent.h" +#include "rangeinput_impl.h" +#include "copymoveview_impl.h" #include #include diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp index 74fb28a..a285590 100644 --- a/src/svnfrontend/filelistviewitem.cpp +++ b/src/svnfrontend/filelistviewitem.cpp @@ -19,13 +19,13 @@ ***************************************************************************/ #include "filelistviewitem.h" #include "tdesvnfilelist.h" -#include "src/settings/tdesvnsettings.h" +#include "tdesvnsettings.h" #include "helpers/sub2qt.h" -#include "src/svnqt/status.hpp" -#include "src/svnqt/revision.hpp" -#include "src/svnqt/exception.hpp" -#include "src/svnqt/url.hpp" -#include "fronthelpers/widgetblockstack.h" +#include "status.hpp" +#include "revision.hpp" +#include "exception.hpp" +#include "url.hpp" +#include "widgetblockstack.h" #include #include diff --git a/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp b/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp index 0340049..85f8891 100644 --- a/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp +++ b/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp @@ -19,9 +19,9 @@ ***************************************************************************/ #include "checkoutinfo_impl.h" #include "rangeinput_impl.h" -#include "src/ksvnwidgets/depthselector.h" -#include "src/svnqt/url.hpp" -#include "helpers/ktranslateurl.h" +#include "depthselector.h" +#include "url.hpp" +#include "ktranslateurl.h" #include #include #include diff --git a/src/svnfrontend/fronthelpers/checkoutinfo_impl.h b/src/svnfrontend/fronthelpers/checkoutinfo_impl.h index 64743f7..0c7cd36 100644 --- a/src/svnfrontend/fronthelpers/checkoutinfo_impl.h +++ b/src/svnfrontend/fronthelpers/checkoutinfo_impl.h @@ -21,8 +21,8 @@ #define CHECKOUTINFO_IMPL_H #include "checkoutinfo.h" -#include "src/svnqt/revision.hpp" -#include "src/svnqt/svnqttypes.hpp" +#include "revision.hpp" +#include "svnqttypes.hpp" #include "kurl.h" class CheckoutInfo_impl: public CheckoutInfo { diff --git a/src/svnfrontend/fronthelpers/propertylist.cpp b/src/svnfrontend/fronthelpers/propertylist.cpp index f36721a..1b9a2d2 100644 --- a/src/svnfrontend/fronthelpers/propertylist.cpp +++ b/src/svnfrontend/fronthelpers/propertylist.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "propertylist.h" -#include "src/svnfrontend/fronthelpers/propertyitem.h" +#include "propertyitem.h" #include #include diff --git a/src/svnfrontend/fronthelpers/rangeinput_impl.h b/src/svnfrontend/fronthelpers/rangeinput_impl.h index e43e2b3..be6d5b6 100644 --- a/src/svnfrontend/fronthelpers/rangeinput_impl.h +++ b/src/svnfrontend/fronthelpers/rangeinput_impl.h @@ -21,7 +21,7 @@ #define RANGEINPUT_IMPL_H #include "rangeinput.h" -#include "src/svnqt/revision.hpp" +#include "revision.hpp" #include class Rangeinput_impl: public RangeInputDlg { diff --git a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp index cdd3a08..7e5949b 100644 --- a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp +++ b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "revisionbuttonimpl.h" -#include "src/svnfrontend/fronthelpers/rangeinput_impl.h" -#include "src/settings/tdesvnsettings.h" +#include "rangeinput_impl.h" +#include "tdesvnsettings.h" #include #include diff --git a/src/svnfrontend/graphtree/graphtreelabel.h b/src/svnfrontend/graphtree/graphtreelabel.h index 70cb31f..0bf4c10 100644 --- a/src/svnfrontend/graphtree/graphtreelabel.h +++ b/src/svnfrontend/graphtree/graphtreelabel.h @@ -20,7 +20,7 @@ #ifndef GRAPHTREELABEL_H #define GRAPHTREELABEL_H -#include "graphtree/drawparams.h" +#include "drawparams.h" #include /** diff --git a/src/svnfrontend/svnactions.h b/src/svnfrontend/svnactions.h index 13c8793..02f0bcb 100644 --- a/src/svnfrontend/svnactions.h +++ b/src/svnfrontend/svnactions.h @@ -20,11 +20,11 @@ #ifndef SVNACTIONS_H #define SVNACTIONS_H -#include "src/svnqt/client.hpp" -#include "src/svnqt/revision.hpp" -#include "src/svnqt/smart_pointer.hpp" -#include "src/svnqt/shared_pointer.hpp" -#include "src/svnqt/svnqttypes.hpp" +#include "client.hpp" +#include "revision.hpp" +#include "smart_pointer.hpp" +#include "shared_pointer.hpp" +#include "svnqttypes.hpp" #include "simple_logcb.h"