Fix more FTBFS problems

pull/1/head
Timothy Pearson 13 years ago
parent faca9d4026
commit 67ba735507

@ -18,15 +18,19 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/settings ${CMAKE_SOURCE_DIR}/src/settings
${CMAKE_SOURCE_DIR}/src/svnqt ${CMAKE_SOURCE_DIR}/src/svnqt
${CMAKE_BINARY_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/ksvnwidgets
${CMAKE_SOURCE_DIR}/src/helpers ${CMAKE_SOURCE_DIR}/src/helpers
${CMAKE_SOURCE_DIR}/src/svnfrontend
${CMAKE_SOURCE_DIR}/src/svnqt/cache
${SUBVERSION_INCLUDE_DIR} ${SUBVERSION_INCLUDE_DIR}
/usr/include/apr-1.0 /usr/include/apr-1.0
) )
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TQT_LIBRARY_DIRS}
${CMAKE_BINARY_DIR}/src
) )
@ -168,14 +172,17 @@ tde_add_library( ksvnwidgets STATIC AUTOMOC
tde_add_kpart( kio_ksvn AUTOMOC tde_add_kpart( kio_ksvn AUTOMOC
SOURCES kiosvn/kiosvn.cpp kiosvn/kiolistener.cpp kiosvn/kiobytestream.cpp ksvnwidgets/pwstorage.cpp 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} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
ADD_DEPENDENCIES(kio_ksvn-module tdesvnhelpers-static)
ADD_DEPENDENCIES(kio_ksvn-module tdesvncfgreader-static)
##### tdesvnhelpers ############################## ##### tdesvnhelpers ##############################
tde_add_library( tdesvnhelpers STATIC AUTOMOC tde_add_library( tdesvnhelpers STATIC_PIC AUTOMOC
SOURCES helpers/ktranslateurl.cpp helpers/sshagent.cpp helpers/sub2qt.cpp SOURCES helpers/ktranslateurl.cpp helpers/sshagent.cpp helpers/sub2qt.cpp
# LINK kio-shared # LINK kio-shared
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
@ -184,7 +191,7 @@ tde_add_library( tdesvnhelpers STATIC AUTOMOC
##### tdesvncfgreader ########################### ##### tdesvncfgreader ###########################
tde_add_library( tdesvncfgreader STATIC AUTOMOC tde_add_library( tdesvncfgreader STATIC_PIC AUTOMOC
SOURCES settings/dispcolor_settings.ui SOURCES settings/dispcolor_settings.ui
settings/display_settings.ui settings/revisiontree_settings.ui settings/display_settings.ui settings/revisiontree_settings.ui
settings/subversion_settings.ui settings/cmdexecsettings.ui settings/subversion_settings.ui settings/cmdexecsettings.ui

@ -20,8 +20,8 @@
#ifndef KIOLISTENER_H #ifndef KIOLISTENER_H
#define KIOLISTENER_H #define KIOLISTENER_H
#include "src/svnqt/context_listener.hpp" #include "context_listener.hpp"
#include "src/ksvnwidgets/pwstorage.h" #include "pwstorage.h"
namespace KIO { namespace KIO {
class SlaveBase; class SlaveBase;

@ -624,7 +624,7 @@ void Logmsg_impl::insertFile(const TQString&fname)
void Logmsg_impl::insertFile() void Logmsg_impl::insertFile()
{ {
TQString head = i18n("Select textfile for insert"); TQString head = i18n("Select textfile for insert");
KURLRequesterDlg dlg(TQString(),this,head); KURLRequesterDlg dlg(TQString(),this,head.ascii());
dlg.setCaption(head); dlg.setCaption(head);
KFile::Mode mode = static_cast<KFile::Mode>(KFile::File); KFile::Mode mode = static_cast<KFile::Mode>(KFile::File);
dlg.urlRequester()->setMode(mode); dlg.urlRequester()->setMode(mode);

@ -86,9 +86,9 @@
<connections> <connections>
<connection> <connection>
<sender>m_BlameList</sender> <sender>m_BlameList</sender>
<signal>contextMenu(KListView*,TQListViewItem*,const QPoint&amp;)</signal> <signal>contextMenu(KListView*,TQListViewItem*,const TQPoint&amp;)</signal>
<receiver>BlameDisplay</receiver> <receiver>BlameDisplay</receiver>
<slot>slotContextMenuRequested(KListView*,TQListViewItem*,const QPoint&amp;)</slot> <slot>slotContextMenuRequested(KListView*,TQListViewItem*,const TQPoint&amp;)</slot>
</connection> </connection>
<connection> <connection>
<sender>m_BlameList</sender> <sender>m_BlameList</sender>
@ -98,7 +98,7 @@
</connection> </connection>
</connections> </connections>
<Q_SLOTS> <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> <slot access="protected">slotItemDoubleClicked(TQListViewItem*)</slot>
</Q_SLOTS> </Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>

@ -21,7 +21,7 @@
#define BLAMEDISPLAY_IMPL_H #define BLAMEDISPLAY_IMPL_H
#include "blamedisplay.h" #include "blamedisplay.h"
#include "src/svnqt/client.hpp" #include "client.hpp"
class BlameDisplayData; class BlameDisplayData;
class SimpleLogCb; class SimpleLogCb;

@ -20,9 +20,9 @@
#ifndef HELPERSCACHEENTRY_H #ifndef HELPERSCACHEENTRY_H
#define HELPERSCACHEENTRY_H #define HELPERSCACHEENTRY_H
#include "src/svnqt/svnqttypes.hpp" #include "svnqttypes.hpp"
#include "src/svnqt/shared_pointer.hpp" #include "shared_pointer.hpp"
#include "src/svnqt/status.hpp" #include "status.hpp"
// std::map 'cause TQMap isn't usable // std::map 'cause TQMap isn't usable
#include <map> #include <map>

@ -20,9 +20,9 @@
#ifndef _FILLCACHE_THREAD_H #ifndef _FILLCACHE_THREAD_H
#define _FILLCACHE_THREAD_H #define _FILLCACHE_THREAD_H
#include "src/svnqt/client.hpp" #include "client.hpp"
#include "src/svnqt/revision.hpp" #include "revision.hpp"
#include "src/svnqt/status.hpp" #include "status.hpp"
#include "ccontextlistener.h" #include "ccontextlistener.h"
#include "eventnumbers.h" #include "eventnumbers.h"
#include "frontendtypes.h" #include "frontendtypes.h"

@ -21,9 +21,9 @@
#include "graphtreelabel.h" #include "graphtreelabel.h"
#include "pannerview.h" #include "pannerview.h"
#include "graphtree_defines.h" #include "graphtree_defines.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include "../stopdlg.h" #include "stopdlg.h"
#include "src/svnqt/client.hpp" #include "client.hpp"
#include <kapp.h> #include <kapp.h>
#include <kdebug.h> #include <kdebug.h>

@ -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 "revisiontree.h" #include "revisiontree.h"
#include "../stopdlg.h" #include "stopdlg.h"
#include "src/svnqt/log_entry.hpp" #include "log_entry.hpp"
#include "src/svnqt/cache/LogCache.hpp" #include "LogCache.hpp"
#include "src/svnqt/cache/ReposLog.hpp" #include "ReposLog.hpp"
#include "src/svnqt/url.hpp" #include "url.hpp"
#include "helpers/sub2qt.h" #include "sub2qt.h"
#include "revtreewidget.h" #include "revtreewidget.h"
#include "revgraphview.h" #include "revgraphview.h"
#include "elogentry.h" #include "elogentry.h"
#include "src/svnfrontend/fronthelpers/cursorstack.h" #include "cursorstack.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include <kdebug.h> #include <kdebug.h>
#include <kprogress.h> #include <kprogress.h>

@ -20,9 +20,9 @@
#ifndef REVISIONTREE_H #ifndef REVISIONTREE_H
#define REVISIONTREE_H #define REVISIONTREE_H
#include "src/svnqt/log_entry.hpp" #include "log_entry.hpp"
#include "src/svnqt/revision.hpp" #include "revision.hpp"
#include "src/svnqt/client.hpp" #include "client.hpp"
#include <tqstring.h> #include <tqstring.h>
#include <tqmap.h> #include <tqmap.h>

@ -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 "revtreewidget.h" #include "revtreewidget.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include <tqvariant.h> #include <tqvariant.h>
#include <tqsplitter.h> #include <tqsplitter.h>

@ -19,7 +19,7 @@
***************************************************************************/ ***************************************************************************/
#include "importdir_logmsg.h" #include "importdir_logmsg.h"
#include "src/svnqt/version_check.hpp" #include "version_check.hpp"
#include <klocale.h> #include <klocale.h>

@ -20,7 +20,7 @@
#ifndef IMPORTDIR_LOGMSG_H #ifndef IMPORTDIR_LOGMSG_H
#define IMPORTDIR_LOGMSG_H #define IMPORTDIR_LOGMSG_H
#include "src/ksvnwidgets/logmsg_impl.h" #include "logmsg_impl.h"
class TQCheckBox; class TQCheckBox;
/** /**

@ -20,8 +20,8 @@
#include "itemdisplay.h" #include "itemdisplay.h"
#include "svnitem.h" #include "svnitem.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include "src/svnqt/status.hpp" #include "status.hpp"
ItemDisplay::ItemDisplay() ItemDisplay::ItemDisplay()

@ -19,9 +19,9 @@
***************************************************************************/ ***************************************************************************/
#include "mergedlg_impl.h" #include "mergedlg_impl.h"
#include "rangeinput_impl.h" #include "rangeinput_impl.h"
#include "src/svnqt/url.hpp" #include "svnqt/url.hpp"
#include "helpers/ktranslateurl.h" #include "ktranslateurl.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kdialogbase.h> #include <kdialogbase.h>

@ -21,7 +21,7 @@
#include "modifiedthread.h" #include "modifiedthread.h"
#include "tcontextlistener.h" #include "tcontextlistener.h"
#include "src/svnqt/svnqttypes.hpp" #include "svnqttypes.hpp"
#include <tqobject.h> #include <tqobject.h>
#include <kdebug.h> #include <kdebug.h>

@ -20,9 +20,9 @@
#ifndef _MODIFIED_THREAD_H #ifndef _MODIFIED_THREAD_H
#define _MODIFIED_THREAD_H #define _MODIFIED_THREAD_H
#include "src/svnqt/client.hpp" #include "client.hpp"
#include "src/svnqt/revision.hpp" #include "revision.hpp"
#include "src/svnqt/status.hpp" #include "status.hpp"
#include "ccontextlistener.h" #include "ccontextlistener.h"
#include "eventnumbers.h" #include "eventnumbers.h"
#include "frontendtypes.h" #include "frontendtypes.h"

@ -18,12 +18,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include "src/svnfrontend/fronthelpers/propertyitem.h" #include "propertyitem.h"
#include "src/svnfrontend/fronthelpers/propertylist.h" #include "propertylist.h"
#include "propertiesdlg.h" #include "propertiesdlg.h"
#include "editproperty_impl.h" #include "editproperty_impl.h"
#include "svnitem.h" #include "svnitem.h"
#include "src/svnqt/client.hpp" #include "client.hpp"
#include <tqvariant.h> #include <tqvariant.h>
#include <tqlabel.h> #include <tqlabel.h>

@ -26,8 +26,8 @@
#include <tqmap.h> #include <tqmap.h>
#include <tqstring.h> #include <tqstring.h>
#include "src/svnqt/svnqttypes.hpp" #include "svnqttypes.hpp"
#include "src/svnqt/revision.hpp" #include "revision.hpp"
class TQVBoxLayout; class TQVBoxLayout;
class TQHBoxLayout; class TQHBoxLayout;

@ -19,8 +19,8 @@
***************************************************************************/ ***************************************************************************/
#include "stopdlg.h" #include "stopdlg.h"
#include "ccontextlistener.h" #include "ccontextlistener.h"
#include "settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include "helpers/stringhelper.h" #include "stringhelper.h"
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>

@ -30,24 +30,24 @@
#include "svnlogdlgimp.h" #include "svnlogdlgimp.h"
#include "stopdlg.h" #include "stopdlg.h"
#include "blamedisplay_impl.h" #include "blamedisplay_impl.h"
#include "src/ksvnwidgets/logmsg_impl.h" #include "logmsg_impl.h"
#include "src/ksvnwidgets/diffbrowser.h" #include "diffbrowser.h"
#include "src/ksvnwidgets/encodingselector_impl.h" #include "encodingselector_impl.h"
#include "src/ksvnwidgets/revertform_impl.h" #include "revertform_impl.h"
#include "graphtree/revisiontree.h" #include "revisiontree.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include "src/tdesvn_events.h" #include "tdesvn_events.h"
#include "src/svnqt/client.hpp" #include "client.hpp"
#include "src/svnqt/annotate_line.hpp" #include "annotate_line.hpp"
#include "src/svnqt/context_listener.hpp" #include "context_listener.hpp"
#include "src/svnqt/dirent.hpp" #include "dirent.hpp"
#include "src/svnqt/targets.hpp" #include "targets.hpp"
#include "src/svnqt/url.hpp" #include "url.hpp"
#include "src/svnqt/wc.hpp" #include "wc.hpp"
#include "src/svnqt/svnqt_defines.hpp" #include "svnqt_defines.hpp"
#include "src/svnqt/cache/LogCache.hpp" #include "LogCache.hpp"
#include "src/svnqt/cache/ReposLog.hpp" #include "ReposLog.hpp"
#include "src/svnqt/url.hpp" #include "url.hpp"
#include "helpers/sub2qt.h" #include "helpers/sub2qt.h"
#include "fronthelpers/cursorstack.h" #include "fronthelpers/cursorstack.h"

@ -21,12 +21,12 @@
#include "svnitem.h" #include "svnitem.h"
#include "svnactions.h" #include "svnactions.h"
#include "tdesvn_part.h" #include "tdesvn_part.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include "src/svnqt/status.hpp" #include "status.hpp"
#include "src/svnqt/smart_pointer.hpp" #include "smart_pointer.hpp"
#include "src/svnqt/url.hpp" #include "url.hpp"
#include "helpers/sub2qt.h" #include "sub2qt.h"
#include "helpers/ktranslateurl.h" #include "ktranslateurl.h"
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>

@ -389,9 +389,9 @@
</connection> </connection>
<connection> <connection>
<sender>m_LogView</sender> <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> <receiver>LogDialog</receiver>
<slot>slotItemClicked(int,TQListViewItem*,const QPoint&amp;,int)</slot> <slot>slotItemClicked(int,TQListViewItem*,const TQPoint&amp;,int)</slot>
</connection> </connection>
<connection> <connection>
<sender>m_DispSpecDiff</sender> <sender>m_DispSpecDiff</sender>
@ -419,9 +419,9 @@
</connection> </connection>
<connection> <connection>
<sender>m_ChangedList</sender> <sender>m_ChangedList</sender>
<signal>contextMenuRequested(TQListViewItem*,const QPoint&amp;,int)</signal> <signal>contextMenuRequested(TQListViewItem*,const TQPoint&amp;,int)</signal>
<receiver>LogDialog</receiver> <receiver>LogDialog</receiver>
<slot>slotSingleContext(TQListViewItem*,const QPoint&amp;,int)</slot> <slot>slotSingleContext(TQListViewItem*,const TQPoint&amp;,int)</slot>
</connection> </connection>
<connection> <connection>
<sender>m_ChangedList</sender> <sender>m_ChangedList</sender>
@ -452,12 +452,12 @@
<slot access="protected">slotSelectionChanged(TQListViewItem*)</slot> <slot access="protected">slotSelectionChanged(TQListViewItem*)</slot>
<slot access="protected">slotItemChanged(TQListViewItem*)</slot> <slot access="protected">slotItemChanged(TQListViewItem*)</slot>
<slot access="protected">slotDispPrevious()</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">slotDispSelected()</slot>
<slot access="protected">slotListEntries()</slot> <slot access="protected">slotListEntries()</slot>
<slot access="protected">slotBlameItem()</slot> <slot access="protected">slotBlameItem()</slot>
<slot access="protected">slotEntriesSelectionChanged()</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">slotSingleDoubleClicked(TQListViewItem*)</slot>
<slot access="protected">slotRevisionSelected()</slot> <slot access="protected">slotRevisionSelected()</slot>
<slot access="protected">slotGetLogs()</slot> <slot access="protected">slotGetLogs()</slot>

@ -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 "svnlogdlgimp.h" #include "svnlogdlgimp.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include "src/svnqt/log_entry.hpp" #include "log_entry.hpp"
#include "helpers/sub2qt.h" #include "sub2qt.h"
#include "svnactions.h" #include "svnactions.h"
#include "src/svnfrontend/fronthelpers/revisionbuttonimpl.h" #include "revisionbuttonimpl.h"
#include <klistview.h> #include <klistview.h>
#include <ktextbrowser.h> #include <ktextbrowser.h>

@ -22,9 +22,9 @@
#include "svnlogdlg.h" #include "svnlogdlg.h"
#include "simple_logcb.h" #include "simple_logcb.h"
#include "src/svnqt/log_entry.hpp" #include "log_entry.hpp"
#include "src/svnqt/client.hpp" #include "client.hpp"
#include "src/svnqt/shared_pointer.hpp" #include "shared_pointer.hpp"
#include <tqsize.h> #include <tqsize.h>
#include <tqregexp.h> #include <tqregexp.h>

@ -30,16 +30,16 @@
#include "opencontextmenu.h" #include "opencontextmenu.h"
#include "checkoutinfo_impl.h" #include "checkoutinfo_impl.h"
#include "stopdlg.h" #include "stopdlg.h"
#include "src/settings/tdesvnsettings.h" #include "tdesvnsettings.h"
#include "src/svnqt/revision.hpp" #include "revision.hpp"
#include "src/svnqt/dirent.hpp" #include "dirent.hpp"
#include "src/svnqt/client.hpp" #include "client.hpp"
#include "src/svnqt/status.hpp" #include "status.hpp"
#include "src/svnqt/url.hpp" #include "url.hpp"
#include "helpers/sshagent.h" #include "sshagent.h"
#include "helpers/sub2qt.h" #include "sub2qt.h"
#include "fronthelpers/cursorstack.h" #include "cursorstack.h"
#include "fronthelpers/widgetblockstack.h" #include "widgetblockstack.h"
#include <kapplication.h> #include <kapplication.h>
#include <kiconloader.h> #include <kiconloader.h>
@ -1571,7 +1571,7 @@ TQDragObject* tdesvnfilelist::dragObject()
TQString t; TQString t;
KURL::List::ConstIterator it = urls.begin(); KURL::List::ConstIterator it = urls.begin();
for (;it!=urls.end();++it) { for (;it!=urls.end();++it) {
l.append((*it).prettyURL()); l.append((*it).prettyURL().ascii());
} }
drag->setUris(l); drag->setUris(l);
} }

@ -32,9 +32,9 @@
#define _SVNCPP_CONTEXT_LISTENER_HPP_ #define _SVNCPP_CONTEXT_LISTENER_HPP_
// svncpp // svncpp
#include "svnqt/pool.hpp" #include "pool.hpp"
#include "svnqt/commititem.hpp" #include "commititem.hpp"
#include "svnqt/svnqt_defines.hpp" #include "svnqt_defines.hpp"
// qt // qt
#include <tqstring.h> #include <tqstring.h>
// Subversion api // Subversion api

Loading…
Cancel
Save