Fix a number of build failures

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 <tqmap.h>

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 <kpassdlg.h>
 #include <klineedit.h>

src/ksvnwidgets/authdialogimpl.h

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

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 <klocale.h>
 

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;
 

src/ksvnwidgets/diffbrowser.cpp

@@ -20,7 +20,7 @@
 
 #include "diffbrowser.h"
 #include "diffbrowserdata.h"
-#include "src/settings/tdesvnsettings.h"
+#include "tdesvnsettings.h"
 
 #include <kglobalsettings.h>
 #include <kglobal.h>
@@ -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 {

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

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;
 

src/ksvnwidgets/logmessage.ui

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

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 <ktextedit.h>

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 <tqvaluelist.h>
 #include <tqpair.h>
 

src/ksvnwidgets/revertform.ui

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

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;
 

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 <klocale.h>
 #include <tqlabel.h>

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

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 <tqbuttongroup.h>
 #include <tqcheckbox.h>

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 <tqbuttongroup.h>
 #include <tqcheckbox.h>

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)

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 <klocale.h>
 #include <kapp.h>
@@ -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());
 }
 
 /*!

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 <tqobject.h>
 #include <tqstring.h>

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 <kapp.h>
 #include <kglobal.h>

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 <klocale.h>
 #include <kiconloader.h>

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 <kurlrequester.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>

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 {

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 <klocale.h>
 #include <kdebug.h>

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 <tqpair.h>
 
 class Rangeinput_impl: public RangeInputDlg {

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 <kpushbutton.h>
 #include <kdialog.h>

src/svnfrontend/graphtree/graphtreelabel.h

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

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"