Rename a number of libraries and executables to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 07a23b0645
commit 788d41b1df

@ -54,7 +54,7 @@ tde_add_executable( tdesvnaskpass AUTOMOC
tde_add_executable( tdesvn AUTOMOC tde_add_executable( tdesvn AUTOMOC
SOURCES main.cpp tdesvn.cpp urldlg.cpp commandline.cpp SOURCES main.cpp tdesvn.cpp urldlg.cpp commandline.cpp
LINK tdecore-shared tdeui-shared kparts-shared DCOP-shared kio-shared LINK tdecore-shared tdeui-shared tdeparts-shared DCOP-shared kio-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )
@ -84,7 +84,7 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK tdecore-shared kio-shared kparts-shared tdeui-shared svnqt tdesvnhelpers tdesvnevents tdesvncfgreader ksvnwidgets svnfrontend LINK tdecore-shared kio-shared tdeparts-shared tdeui-shared svnqt tdesvnhelpers tdesvnevents tdesvncfgreader ksvnwidgets svnfrontend
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
@ -180,7 +180,7 @@ tde_add_library( svnfrontend SHARED AUTOMOC
commandline_part.cpp commandline_part.cpp
tdesvnview.cpp tdesvnview.cpp
tdesvn_part.cpp tdesvn_part.cpp
LINK svnqt tdecore-shared tdesvnhelpers tdesvnevents tdesvncfgreader tdeui-shared ksvnwidgets kio-shared kparts-shared LINK svnqt tdecore-shared tdesvnhelpers tdesvnevents tdesvncfgreader tdeui-shared ksvnwidgets kio-shared tdeparts-shared
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -53,7 +53,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
in your app. in your app.
For more details, consult : For more details, consult :
http://www-106.ibm.com/developerworks/library/l-kparts/ http://www-106.ibm.com/developerworks/library/l-tdeparts/
http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html

@ -21,7 +21,7 @@
#include "tdesvn-config.h" #include "tdesvn-config.h"
#include "tdesvnsettings.h" #include "tdesvnsettings.h"
#include <kwallet.h> #include <tdewallet.h>
#include <twin.h> #include <twin.h>
#include <kapp.h> #include <kapp.h>

@ -1556,7 +1556,7 @@ TQDragObject* tdesvnfilelist::dragObject()
if (( urls.count() > 1 ) || (pixmap0Invalid)) { if (( urls.count() > 1 ) || (pixmap0Invalid)) {
int iconSize = Kdesvnsettings::listview_icon_size();; int iconSize = Kdesvnsettings::listview_icon_size();;
iconSize = iconSize ? iconSize : tdesvnPartFactory::instance()->iconLoader()->currentSize( KIcon::Small ); // Default = small iconSize = iconSize ? iconSize : tdesvnPartFactory::instance()->iconLoader()->currentSize( KIcon::Small ); // Default = small
pixmap2 = DesktopIcon( "kmultiple", iconSize ); pixmap2 = DesktopIcon( "tdemultiple", iconSize );
if ( pixmap2.isNull() ) { if ( pixmap2.isNull() ) {
kdWarning() << "Could not find multiple pixmap" << endl; kdWarning() << "Could not find multiple pixmap" << endl;
} }

@ -25,7 +25,7 @@
#include "tdesvn-config.h" #include "tdesvn-config.h"
#include <kapplication.h> #include <kapplication.h>
#include <kparts/mainwindow.h> #include <tdeparts/mainwindow.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <kbookmarkmanager.h> #include <kbookmarkmanager.h>

@ -23,11 +23,11 @@
#include "tdesvn-config.h" #include "tdesvn-config.h"
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <kparts/factory.h> #include <tdeparts/factory.h>
#include <kparts/statusbarextension.h> #include <tdeparts/statusbarextension.h>
#include <kparts/browserextension.h> #include <tdeparts/browserextension.h>
class tdesvnView; class tdesvnView;
class TQPainter; class TQPainter;

@ -24,7 +24,7 @@
#include "repositorylistener.hpp" #include "repositorylistener.hpp"
#include <tqwidget.h> #include <tqwidget.h>
#include <kparts/part.h> #include <tdeparts/part.h>
class TQPainter; class TQPainter;
class KURL; class KURL;

Loading…
Cancel
Save