Fix a number of build failures

14 files changed, 21 insertions, 21 deletions

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 <kpassdlg.h>
 #include <klineedit.h>
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 <tqstring.h>
 
 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 <klocale.h>
 
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 <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 {
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 @@
 <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>
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 <ktextedit.h>
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 <tqvaluelist.h>
 #include <tqpair.h>
 
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 @@
 <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>
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 <klocale.h>
 #include <tqlabel.h>
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