Fix more FTBFS problems

27 files changed, 108 insertions, 101 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5bf93c9..246f11a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,15 +18,19 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/settings
   ${CMAKE_SOURCE_DIR}/src/svnqt
   ${CMAKE_BINARY_DIR}/src/svnqt
-  ${CMAKE_SOURCE_DIR}/src/svnfrontend/fronthelpers/
+  ${CMAKE_SOURCE_DIR}/src/svnfrontend/graphtree
+  ${CMAKE_SOURCE_DIR}/src/svnfrontend/fronthelpers
   ${CMAKE_SOURCE_DIR}/src/ksvnwidgets
   ${CMAKE_SOURCE_DIR}/src/helpers
+  ${CMAKE_SOURCE_DIR}/src/svnfrontend
+  ${CMAKE_SOURCE_DIR}/src/svnqt/cache
   ${SUBVERSION_INCLUDE_DIR}
   /usr/include/apr-1.0
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
+  ${CMAKE_BINARY_DIR}/src
 )
 
 
@@ -168,14 +172,17 @@ tde_add_library( ksvnwidgets STATIC AUTOMOC
 
 tde_add_kpart( kio_ksvn AUTOMOC
   SOURCES kiosvn/kiosvn.cpp kiosvn/kiolistener.cpp kiosvn/kiobytestream.cpp ksvnwidgets/pwstorage.cpp
-  LINK svnqt tdesvnhelpers tdesvncfgreader tdecore-shared tdeui-shared DCOP-shared kio-shared kwallet-shared
+  LINK svnqt tdesvnhelpers tdesvncfgreader tdecore-shared tdeui-shared DCOP-shared kio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
+ADD_DEPENDENCIES(kio_ksvn-module tdesvnhelpers-static)
+ADD_DEPENDENCIES(kio_ksvn-module tdesvncfgreader-static)
+
 
 ##### tdesvnhelpers ##############################
 
-tde_add_library( tdesvnhelpers STATIC AUTOMOC
+tde_add_library( tdesvnhelpers STATIC_PIC AUTOMOC
   SOURCES helpers/ktranslateurl.cpp helpers/sshagent.cpp helpers/sub2qt.cpp
 #  LINK kio-shared
   DESTINATION ${LIB_INSTALL_DIR}
@@ -184,7 +191,7 @@ tde_add_library( tdesvnhelpers STATIC AUTOMOC
 
 ##### tdesvncfgreader ###########################
 
-tde_add_library( tdesvncfgreader STATIC AUTOMOC
+tde_add_library( tdesvncfgreader STATIC_PIC AUTOMOC
   SOURCES settings/dispcolor_settings.ui
     settings/display_settings.ui settings/revisiontree_settings.ui
     settings/subversion_settings.ui settings/cmdexecsettings.ui
diff --git a/src/kiosvn/kiolistener.h b/src/kiosvn/kiolistener.h
index fea9cc2..ffb2b04 100644
--- a/src/kiosvn/kiolistener.h
+++ b/src/kiosvn/kiolistener.h
@@ -20,8 +20,8 @@
 #ifndef KIOLISTENER_H
 #define KIOLISTENER_H
 
-#include "src/svnqt/context_listener.hpp"
-#include "src/ksvnwidgets/pwstorage.h"
+#include "context_listener.hpp"
+#include "pwstorage.h"
 
 namespace KIO {
     class SlaveBase;
diff --git a/src/ksvnwidgets/logmsg_impl.cpp b/src/ksvnwidgets/logmsg_impl.cpp
index 283ae2b..037a66f 100644
--- a/src/ksvnwidgets/logmsg_impl.cpp
+++ b/src/ksvnwidgets/logmsg_impl.cpp
@@ -624,7 +624,7 @@ void Logmsg_impl::insertFile(const TQString&fname)
 void Logmsg_impl::insertFile()
 {
     TQString head = i18n("Select textfile for insert");
-    KURLRequesterDlg dlg(TQString(),this,head);
+    KURLRequesterDlg dlg(TQString(),this,head.ascii());
     dlg.setCaption(head);
     KFile::Mode mode = static_cast<KFile::Mode>(KFile::File);
     dlg.urlRequester()->setMode(mode);
diff --git a/src/svnfrontend/blamedisplay.ui b/src/svnfrontend/blamedisplay.ui
index 4258867..4a6851c 100644
--- a/src/svnfrontend/blamedisplay.ui
+++ b/src/svnfrontend/blamedisplay.ui
@@ -86,9 +86,9 @@
 <connections>
     <connection>
         <sender>m_BlameList</sender>
-        <signal>contextMenu(KListView*,TQListViewItem*,const QPoint&amp;)</signal>
+        <signal>contextMenu(KListView*,TQListViewItem*,const TQPoint&amp;)</signal>
         <receiver>BlameDisplay</receiver>
-        <slot>slotContextMenuRequested(KListView*,TQListViewItem*,const QPoint&amp;)</slot>
+        <slot>slotContextMenuRequested(KListView*,TQListViewItem*,const TQPoint&amp;)</slot>
     </connection>
     <connection>
         <sender>m_BlameList</sender>
@@ -98,7 +98,7 @@
     </connection>
 </connections>
 <Q_SLOTS>
-    <slot access="protected">slotContextMenuRequested(KListView*,TQListViewItem*, const QPoint&amp;)</slot>
+    <slot access="protected">slotContextMenuRequested(KListView*,TQListViewItem*, const TQPoint&amp;)</slot>
     <slot access="protected">slotItemDoubleClicked(TQListViewItem*)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
diff --git a/src/svnfrontend/blamedisplay_impl.h b/src/svnfrontend/blamedisplay_impl.h
index 69df0a8..d6301ba 100644
--- a/src/svnfrontend/blamedisplay_impl.h
+++ b/src/svnfrontend/blamedisplay_impl.h
@@ -21,7 +21,7 @@
 #define BLAMEDISPLAY_IMPL_H
 
 #include "blamedisplay.h"
-#include "src/svnqt/client.hpp"
+#include "client.hpp"
 
 class BlameDisplayData;
 class SimpleLogCb;
diff --git a/src/svnfrontend/cacheentry.h b/src/svnfrontend/cacheentry.h
index d3be7a4..1b36a95 100644
--- a/src/svnfrontend/cacheentry.h
+++ b/src/svnfrontend/cacheentry.h
@@ -20,9 +20,9 @@
 #ifndef HELPERSCACHEENTRY_H
 #define HELPERSCACHEENTRY_H
 
-#include "src/svnqt/svnqttypes.hpp"
-#include "src/svnqt/shared_pointer.hpp"
-#include "src/svnqt/status.hpp"
+#include "svnqttypes.hpp"
+#include "shared_pointer.hpp"
+#include "status.hpp"
 
 // std::map 'cause TQMap isn't usable
 #include <map>
diff --git a/src/svnfrontend/fillcachethread.h b/src/svnfrontend/fillcachethread.h
index 90951c9..295f28b 100644
--- a/src/svnfrontend/fillcachethread.h
+++ b/src/svnfrontend/fillcachethread.h
@@ -20,9 +20,9 @@
 #ifndef _FILLCACHE_THREAD_H
 #define _FILLCACHE_THREAD_H
 
-#include "src/svnqt/client.hpp"
-#include "src/svnqt/revision.hpp"
-#include "src/svnqt/status.hpp"
+#include "client.hpp"
+#include "revision.hpp"
+#include "status.hpp"
 #include "ccontextlistener.h"
 #include "eventnumbers.h"
 #include "frontendtypes.h"
diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp
index 32f8e2d..bb2bb3c 100644
--- a/src/svnfrontend/graphtree/revgraphview.cpp
+++ b/src/svnfrontend/graphtree/revgraphview.cpp
@@ -21,9 +21,9 @@
 #include "graphtreelabel.h"
 #include "pannerview.h"
 #include "graphtree_defines.h"
-#include "src/settings/tdesvnsettings.h"
-#include "../stopdlg.h"
-#include "src/svnqt/client.hpp"
+#include "tdesvnsettings.h"
+#include "stopdlg.h"
+#include "client.hpp"
 
 #include <kapp.h>
 #include <kdebug.h>
diff --git a/src/svnfrontend/graphtree/revisiontree.cpp b/src/svnfrontend/graphtree/revisiontree.cpp
index 6932768..335994e 100644
--- a/src/svnfrontend/graphtree/revisiontree.cpp
+++ b/src/svnfrontend/graphtree/revisiontree.cpp
@@ -18,17 +18,17 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 #include "revisiontree.h"
-#include "../stopdlg.h"
-#include "src/svnqt/log_entry.hpp"
-#include "src/svnqt/cache/LogCache.hpp"
-#include "src/svnqt/cache/ReposLog.hpp"
-#include "src/svnqt/url.hpp"
-#include "helpers/sub2qt.h"
+#include "stopdlg.h"
+#include "log_entry.hpp"
+#include "LogCache.hpp"
+#include "ReposLog.hpp"
+#include "url.hpp"
+#include "sub2qt.h"
 #include "revtreewidget.h"
 #include "revgraphview.h"
 #include "elogentry.h"
-#include "src/svnfrontend/fronthelpers/cursorstack.h"
-#include "src/settings/tdesvnsettings.h"
+#include "cursorstack.h"
+#include "tdesvnsettings.h"
 
 #include <kdebug.h>
 #include <kprogress.h>
diff --git a/src/svnfrontend/graphtree/revisiontree.h b/src/svnfrontend/graphtree/revisiontree.h
index 5ce1cb6..e6e5de1 100644
--- a/src/svnfrontend/graphtree/revisiontree.h
+++ b/src/svnfrontend/graphtree/revisiontree.h
@@ -20,9 +20,9 @@
 #ifndef REVISIONTREE_H
 #define REVISIONTREE_H
 
-#include "src/svnqt/log_entry.hpp"
-#include "src/svnqt/revision.hpp"
-#include "src/svnqt/client.hpp"
+#include "log_entry.hpp"
+#include "revision.hpp"
+#include "client.hpp"
 
 #include <tqstring.h>
 #include <tqmap.h>
diff --git a/src/svnfrontend/graphtree/revtreewidget.cpp b/src/svnfrontend/graphtree/revtreewidget.cpp
index a43b61e..2652e3c 100644
--- a/src/svnfrontend/graphtree/revtreewidget.cpp
+++ b/src/svnfrontend/graphtree/revtreewidget.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 #include "revtreewidget.h"
-#include "src/settings/tdesvnsettings.h"
+#include "tdesvnsettings.h"
 
 #include <tqvariant.h>
 #include <tqsplitter.h>
diff --git a/src/svnfrontend/importdir_logmsg.cpp b/src/svnfrontend/importdir_logmsg.cpp
index 0b89a77..5d3d113 100644
--- a/src/svnfrontend/importdir_logmsg.cpp
+++ b/src/svnfrontend/importdir_logmsg.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "importdir_logmsg.h"
 
-#include "src/svnqt/version_check.hpp"
+#include "version_check.hpp"
 
 #include <klocale.h>
 
diff --git a/src/svnfrontend/importdir_logmsg.h b/src/svnfrontend/importdir_logmsg.h
index c13120f..8feb80b 100644
--- a/src/svnfrontend/importdir_logmsg.h
+++ b/src/svnfrontend/importdir_logmsg.h
@@ -20,7 +20,7 @@
 #ifndef IMPORTDIR_LOGMSG_H
 #define IMPORTDIR_LOGMSG_H
 
-#include "src/ksvnwidgets/logmsg_impl.h"
+#include "logmsg_impl.h"
 
 class TQCheckBox;
 /**
diff --git a/src/svnfrontend/itemdisplay.cpp b/src/svnfrontend/itemdisplay.cpp
index fe2d46a..fb8795b 100644
--- a/src/svnfrontend/itemdisplay.cpp
+++ b/src/svnfrontend/itemdisplay.cpp
@@ -20,8 +20,8 @@
 
 #include "itemdisplay.h"
 #include "svnitem.h"
-#include "src/settings/tdesvnsettings.h"
-#include "src/svnqt/status.hpp"
+#include "tdesvnsettings.h"
+#include "status.hpp"
 
 
 ItemDisplay::ItemDisplay()
diff --git a/src/svnfrontend/mergedlg_impl.cpp b/src/svnfrontend/mergedlg_impl.cpp
index 7caa7c2..44a07c5 100644
--- a/src/svnfrontend/mergedlg_impl.cpp
+++ b/src/svnfrontend/mergedlg_impl.cpp
@@ -19,9 +19,9 @@
  ***************************************************************************/
 #include "mergedlg_impl.h"
 #include "rangeinput_impl.h"
-#include "src/svnqt/url.hpp"
-#include "helpers/ktranslateurl.h"
-#include "src/settings/tdesvnsettings.h"
+#include "svnqt/url.hpp"
+#include "ktranslateurl.h"
+#include "tdesvnsettings.h"
 
 #include <kurlrequester.h>
 #include <kdialogbase.h>
diff --git a/src/svnfrontend/modifiedthread.cpp b/src/svnfrontend/modifiedthread.cpp
index 3169f1e..bebff23 100644
--- a/src/svnfrontend/modifiedthread.cpp
+++ b/src/svnfrontend/modifiedthread.cpp
@@ -21,7 +21,7 @@
 #include "modifiedthread.h"
 #include "tcontextlistener.h"
 
-#include "src/svnqt/svnqttypes.hpp"
+#include "svnqttypes.hpp"
 
 #include <tqobject.h>
 #include <kdebug.h>
diff --git a/src/svnfrontend/modifiedthread.h b/src/svnfrontend/modifiedthread.h
index ea8a58c..0574c73 100644
--- a/src/svnfrontend/modifiedthread.h
+++ b/src/svnfrontend/modifiedthread.h
@@ -20,9 +20,9 @@
 #ifndef _MODIFIED_THREAD_H
 #define _MODIFIED_THREAD_H
 
-#include "src/svnqt/client.hpp"
-#include "src/svnqt/revision.hpp"
-#include "src/svnqt/status.hpp"
+#include "client.hpp"
+#include "revision.hpp"
+#include "status.hpp"
 #include "ccontextlistener.h"
 #include "eventnumbers.h"
 #include "frontendtypes.h"
diff --git a/src/svnfrontend/propertiesdlg.cpp b/src/svnfrontend/propertiesdlg.cpp
index 4829a8a..ec1f24d 100644
--- a/src/svnfrontend/propertiesdlg.cpp
+++ b/src/svnfrontend/propertiesdlg.cpp
@@ -18,12 +18,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include "src/svnfrontend/fronthelpers/propertyitem.h"
-#include "src/svnfrontend/fronthelpers/propertylist.h"
+#include "propertyitem.h"
+#include "propertylist.h"
 #include "propertiesdlg.h"
 #include "editproperty_impl.h"
 #include "svnitem.h"
-#include "src/svnqt/client.hpp"
+#include "client.hpp"
 
 #include <tqvariant.h>
 #include <tqlabel.h>
diff --git a/src/svnfrontend/propertiesdlg.h b/src/svnfrontend/propertiesdlg.h
index f9a69f1..14cf869 100644
--- a/src/svnfrontend/propertiesdlg.h
+++ b/src/svnfrontend/propertiesdlg.h
@@ -26,8 +26,8 @@
 #include <tqmap.h>
 #include <tqstring.h>
 
-#include "src/svnqt/svnqttypes.hpp"
-#include "src/svnqt/revision.hpp"
+#include "svnqttypes.hpp"
+#include "revision.hpp"
 
 class TQVBoxLayout;
 class TQHBoxLayout;
diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp
index c6487fd..e67d126 100644
--- a/src/svnfrontend/stopdlg.cpp
+++ b/src/svnfrontend/stopdlg.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 #include "stopdlg.h"
 #include "ccontextlistener.h"
-#include "settings/tdesvnsettings.h"
-#include "helpers/stringhelper.h"
+#include "tdesvnsettings.h"
+#include "stringhelper.h"
 
 #include <kapplication.h>
 #include <klocale.h>
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 9ca1cc5..6e102ea 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -30,24 +30,24 @@
 #include "svnlogdlgimp.h"
 #include "stopdlg.h"
 #include "blamedisplay_impl.h"
-#include "src/ksvnwidgets/logmsg_impl.h"
-#include "src/ksvnwidgets/diffbrowser.h"
-#include "src/ksvnwidgets/encodingselector_impl.h"
-#include "src/ksvnwidgets/revertform_impl.h"
-#include "graphtree/revisiontree.h"
-#include "src/settings/tdesvnsettings.h"
-#include "src/tdesvn_events.h"
-#include "src/svnqt/client.hpp"
-#include "src/svnqt/annotate_line.hpp"
-#include "src/svnqt/context_listener.hpp"
-#include "src/svnqt/dirent.hpp"
-#include "src/svnqt/targets.hpp"
-#include "src/svnqt/url.hpp"
-#include "src/svnqt/wc.hpp"
-#include "src/svnqt/svnqt_defines.hpp"
-#include "src/svnqt/cache/LogCache.hpp"
-#include "src/svnqt/cache/ReposLog.hpp"
-#include "src/svnqt/url.hpp"
+#include "logmsg_impl.h"
+#include "diffbrowser.h"
+#include "encodingselector_impl.h"
+#include "revertform_impl.h"
+#include "revisiontree.h"
+#include "tdesvnsettings.h"
+#include "tdesvn_events.h"
+#include "client.hpp"
+#include "annotate_line.hpp"
+#include "context_listener.hpp"
+#include "dirent.hpp"
+#include "targets.hpp"
+#include "url.hpp"
+#include "wc.hpp"
+#include "svnqt_defines.hpp"
+#include "LogCache.hpp"
+#include "ReposLog.hpp"
+#include "url.hpp"
 
 #include "helpers/sub2qt.h"
 #include "fronthelpers/cursorstack.h"
diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp
index d11e039..55015a3 100644
--- a/src/svnfrontend/svnitem.cpp
+++ b/src/svnfrontend/svnitem.cpp
@@ -21,12 +21,12 @@
 #include "svnitem.h"
 #include "svnactions.h"
 #include "tdesvn_part.h"
-#include "src/settings/tdesvnsettings.h"
-#include "src/svnqt/status.hpp"
-#include "src/svnqt/smart_pointer.hpp"
-#include "src/svnqt/url.hpp"
-#include "helpers/sub2qt.h"
-#include "helpers/ktranslateurl.h"
+#include "tdesvnsettings.h"
+#include "status.hpp"
+#include "smart_pointer.hpp"
+#include "url.hpp"
+#include "sub2qt.h"
+#include "ktranslateurl.h"
 
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/src/svnfrontend/svnlogdlg.ui b/src/svnfrontend/svnlogdlg.ui
index aba7c14..f6ba858 100644
--- a/src/svnfrontend/svnlogdlg.ui
+++ b/src/svnfrontend/svnlogdlg.ui
@@ -389,9 +389,9 @@
     </connection>
     <connection>
         <sender>m_LogView</sender>
-        <signal>mouseButtonClicked(int,TQListViewItem*,const QPoint&amp;,int)</signal>
+        <signal>mouseButtonClicked(int,TQListViewItem*,const TQPoint&amp;,int)</signal>
         <receiver>LogDialog</receiver>
-        <slot>slotItemClicked(int,TQListViewItem*,const QPoint&amp;,int)</slot>
+        <slot>slotItemClicked(int,TQListViewItem*,const TQPoint&amp;,int)</slot>
     </connection>
     <connection>
         <sender>m_DispSpecDiff</sender>
@@ -419,9 +419,9 @@
     </connection>
     <connection>
         <sender>m_ChangedList</sender>
-        <signal>contextMenuRequested(TQListViewItem*,const QPoint&amp;,int)</signal>
+        <signal>contextMenuRequested(TQListViewItem*,const TQPoint&amp;,int)</signal>
         <receiver>LogDialog</receiver>
-        <slot>slotSingleContext(TQListViewItem*,const QPoint&amp;,int)</slot>
+        <slot>slotSingleContext(TQListViewItem*,const TQPoint&amp;,int)</slot>
     </connection>
     <connection>
         <sender>m_ChangedList</sender>
@@ -452,12 +452,12 @@
     <slot access="protected">slotSelectionChanged(TQListViewItem*)</slot>
     <slot access="protected">slotItemChanged(TQListViewItem*)</slot>
     <slot access="protected">slotDispPrevious()</slot>
-    <slot access="protected">slotItemClicked(int,TQListViewItem*,const QPoint &amp;,int)</slot>
+    <slot access="protected">slotItemClicked(int,TQListViewItem*,const TQPoint &amp;,int)</slot>
     <slot access="protected">slotDispSelected()</slot>
     <slot access="protected">slotListEntries()</slot>
     <slot access="protected">slotBlameItem()</slot>
     <slot access="protected">slotEntriesSelectionChanged()</slot>
-    <slot access="protected">slotSingleContext(TQListViewItem*, const QPoint &amp;, int)</slot>
+    <slot access="protected">slotSingleContext(TQListViewItem*, const TQPoint &amp;, int)</slot>
     <slot access="protected">slotSingleDoubleClicked(TQListViewItem*)</slot>
     <slot access="protected">slotRevisionSelected()</slot>
     <slot access="protected">slotGetLogs()</slot>
diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp
index 070affa..a81ce18 100644
--- a/src/svnfrontend/svnlogdlgimp.cpp
+++ b/src/svnfrontend/svnlogdlgimp.cpp
@@ -18,11 +18,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 #include "svnlogdlgimp.h"
-#include "src/settings/tdesvnsettings.h"
-#include "src/svnqt/log_entry.hpp"
-#include "helpers/sub2qt.h"
+#include "tdesvnsettings.h"
+#include "log_entry.hpp"
+#include "sub2qt.h"
 #include "svnactions.h"
-#include "src/svnfrontend/fronthelpers/revisionbuttonimpl.h"
+#include "revisionbuttonimpl.h"
 
 #include <klistview.h>
 #include <ktextbrowser.h>
diff --git a/src/svnfrontend/svnlogdlgimp.h b/src/svnfrontend/svnlogdlgimp.h
index 9cd5011..a2213c7 100644
--- a/src/svnfrontend/svnlogdlgimp.h
+++ b/src/svnfrontend/svnlogdlgimp.h
@@ -22,9 +22,9 @@
 
 #include "svnlogdlg.h"
 #include "simple_logcb.h"
-#include "src/svnqt/log_entry.hpp"
-#include "src/svnqt/client.hpp"
-#include "src/svnqt/shared_pointer.hpp"
+#include "log_entry.hpp"
+#include "client.hpp"
+#include "shared_pointer.hpp"
 
 #include <tqsize.h>
 #include <tqregexp.h>
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index 976d3c1..131ea18 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -30,16 +30,16 @@
 #include "opencontextmenu.h"
 #include "checkoutinfo_impl.h"
 #include "stopdlg.h"
-#include "src/settings/tdesvnsettings.h"
-#include "src/svnqt/revision.hpp"
-#include "src/svnqt/dirent.hpp"
-#include "src/svnqt/client.hpp"
-#include "src/svnqt/status.hpp"
-#include "src/svnqt/url.hpp"
-#include "helpers/sshagent.h"
-#include "helpers/sub2qt.h"
-#include "fronthelpers/cursorstack.h"
-#include "fronthelpers/widgetblockstack.h"
+#include "tdesvnsettings.h"
+#include "revision.hpp"
+#include "dirent.hpp"
+#include "client.hpp"
+#include "status.hpp"
+#include "url.hpp"
+#include "sshagent.h"
+#include "sub2qt.h"
+#include "cursorstack.h"
+#include "widgetblockstack.h"
 
 #include <kapplication.h>
 #include <kiconloader.h>
@@ -1571,7 +1571,7 @@ TQDragObject* tdesvnfilelist::dragObject()
         TQString t;
         KURL::List::ConstIterator it = urls.begin();
         for (;it!=urls.end();++it) {
-            l.append((*it).prettyURL());
+            l.append((*it).prettyURL().ascii());
         }
         drag->setUris(l);
     }
diff --git a/src/svnqt/context_listener.hpp b/src/svnqt/context_listener.hpp
index 28084d1..df94c42 100644
--- a/src/svnqt/context_listener.hpp
+++ b/src/svnqt/context_listener.hpp
@@ -32,9 +32,9 @@
 #define _SVNCPP_CONTEXT_LISTENER_HPP_
 
 // svncpp
-#include "svnqt/pool.hpp"
-#include "svnqt/commititem.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "pool.hpp"
+#include "commititem.hpp"
+#include "svnqt_defines.hpp"
 // qt
 #include <tqstring.h>
 // Subversion api