TDE
/
tdesvn
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdesvn
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix more FTBFS problems

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent faca9d4026
commit 67ba735507
27 changed files with 108 additions and 101 deletions
Show Stats Download Patch File Download Diff File

15
src/CMakeLists.txt
Unescape Escape View File

@ -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

4
src/kiosvn/kiolistener.h
Unescape Escape View File

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

2
src/ksvnwidgets/logmsg_impl.cpp
Unescape Escape View File

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

6
src/svnfrontend/blamedisplay.ui
Unescape Escape View File

@ -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"/>

2
src/svnfrontend/blamedisplay_impl.h
Unescape Escape View File

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

6
src/svnfrontend/cacheentry.h
Unescape Escape View File

@ -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>

6
src/svnfrontend/fillcachethread.h
Unescape Escape View File

@ -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"

6
src/svnfrontend/graphtree/revgraphview.cpp
Unescape Escape View File

@ -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>

16
src/svnfrontend/graphtree/revisiontree.cpp
Unescape Escape View File

@ -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>

6
src/svnfrontend/graphtree/revisiontree.h
Unescape Escape View File

@ -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>

2
src/svnfrontend/graphtree/revtreewidget.cpp
Unescape Escape View File

@ -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>

2
src/svnfrontend/importdir_logmsg.cpp
Unescape Escape View File

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

2
src/svnfrontend/importdir_logmsg.h
Unescape Escape View File

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

4
src/svnfrontend/itemdisplay.cpp
Unescape Escape View File

@ -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()

6
src/svnfrontend/mergedlg_impl.cpp
Unescape Escape View File

@ -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>

2
src/svnfrontend/modifiedthread.cpp
Unescape Escape View File

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

6
src/svnfrontend/modifiedthread.h
Unescape Escape View File

@ -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"

6
src/svnfrontend/propertiesdlg.cpp
Unescape Escape View File

@ -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>

4
src/svnfrontend/propertiesdlg.h
Unescape Escape View File

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

4
src/svnfrontend/stopdlg.cpp
Unescape Escape View File

@ -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>

36
src/svnfrontend/svnactions.cpp
Unescape Escape View File

@ -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"

12
src/svnfrontend/svnitem.cpp
Unescape Escape View File

@ -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>

12
src/svnfrontend/svnlogdlg.ui
Unescape Escape View File

@ -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>

8
src/svnfrontend/svnlogdlgimp.cpp
Unescape Escape View File

@ -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>

6
src/svnfrontend/svnlogdlgimp.h
Unescape Escape View File

@ -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>

22
src/svnfrontend/tdesvnfilelist.cpp
Unescape Escape View File

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

6
src/svnqt/context_listener.hpp
Unescape Escape View File

@ -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

Write Preview
Loading…
Cancel
Save