'[calligra] /: remove traces of KParts from Kexi and libcalligradb'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra] /: remove traces of KParts from Kexi and libcalligradb
From:       Jaroslaw Staniek <staniek () kde ! org>
Date:       2013-03-10 23:03:04
Message-ID: 20130310230304.554C3A604F () git ! kde ! org
[Download RAW message or body]

Git commit c70cfb413504eec404149a34daad2b0775a893f8 by Jaroslaw Staniek.
Committed on 10/03/2013 at 00:40.
Pushed by staniek into branch 'master'.

remove traces of KParts from Kexi and libcalligradb

M  +0    -1    kexi/formeditor/CMakeLists.txt
M  +1    -1    kexi/kexidb/CMakeLists.txt
M  +1    -41   kexi/kexidb/drivers/mysql/CMakeLists.txt
M  +1    -1    kexi/kexidb/drivers/odbc/CMakeLists.txt
M  +1    -40   kexi/kexidb/drivers/oracle/CMakeLists.txt
M  +1    -30   kexi/kexidb/drivers/pqxx/CMakeLists.txt
M  +1    -41   kexi/kexidb/drivers/sybase/CMakeLists.txt
M  +0    -1    kexi/kexidb/drivers/xbase/CMakeLists.txt
M  +0    -28   kexi/main/kexistatusbar.cpp
M  +0    -6    kexi/main/kexistatusbar.h
M  +0    -1    kexi/migration/mdb/src/CMakeLists.txt
M  +0    -2    kexi/migration/migratemanager_p.h
M  +0    -26   kexi/migration/mysql/CMakeLists.txt
M  +0    -28   kexi/migration/pqxx/CMakeLists.txt
M  +1    -26   kexi/migration/sybase/CMakeLists.txt
M  +0    -1    kexi/migration/txt/CMakeLists.txt
M  +0    -1    kexi/migration/xbase/CMakeLists.txt
M  +0    -1    kexi/plugins/autoforms/CMakeLists.txt
M  +0    -1    kexi/plugins/reports/CMakeLists.txt
M  +5    -2    libs/db/CMakeLists.txt
M  +0    -2    libs/db/drivermanager_p.h
M  +1    -1    libs/db/drivers/sqlite/CMakeLists.txt

http://commits.kde.org/calligra/c70cfb413504eec404149a34daad2b0775a893f8

diff --git a/kexi/formeditor/CMakeLists.txt b/kexi/formeditor/CMakeLists.txt
index c2370de..00e0607 100644
--- a/kexi/formeditor/CMakeLists.txt
+++ b/kexi/formeditor/CMakeLists.txt
@@ -44,7 +44,6 @@ set(kformdesigner_LIBS
   kexiextendedwidgets
   ${CALLIGRADB_LIBS}
   ${KDE4_KDE3SUPPORT_LIBS}
-  ${KDE4_KPARTS_LIBS}
 )
 
 # enable to add signal/slot connections
diff --git a/kexi/kexidb/CMakeLists.txt b/kexi/kexidb/CMakeLists.txt
index 1fe7ce1..33fdaaa 100644
--- a/kexi/kexidb/CMakeLists.txt
+++ b/kexi/kexidb/CMakeLists.txt
@@ -13,7 +13,7 @@ set(kexidb_LIB_SRCS
 
 kde4_add_library(kexidb SHARED ${kexidb_LIB_SRCS})
 target_link_libraries(kexidb kexiutils ${CALLIGRADB_LIBS}
-   ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KPARTS_LIBS})
+   ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
 
 set_target_properties(kexidb PROPERTIES
                       VERSION ${GENERIC_CALLIGRA_LIB_VERSION}
diff --git a/kexi/kexidb/drivers/mysql/CMakeLists.txt \
b/kexi/kexidb/drivers/mysql/CMakeLists.txt index 86668a2..c10e847 100644
--- a/kexi/kexidb/drivers/mysql/CMakeLists.txt
+++ b/kexi/kexidb/drivers/mysql/CMakeLists.txt
@@ -21,7 +21,7 @@ kde4_add_plugin(kexidb_mysqldriver ${kexidb_mysqldriver_PART_SRCS})
 
 
 target_link_libraries(kexidb_mysqldriver ${MYSQL_LIBRARIES} 
- ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${CALLIGRADB_LIBS} kexidb)
+ ${KDE4_KDECORE_LIBS} ${CALLIGRADB_LIBS} kexidb)
 
 install(TARGETS kexidb_mysqldriver  DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -29,43 +29,3 @@ install(TARGETS kexidb_mysqldriver  DESTINATION \
${PLUGIN_INSTALL_DIR})  ########### install files ###############
 
 install( FILES  kexidb_mysqldriver.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
-
-
-
-
-
-#original Makefile.am contents follow:
-
-#include $(top_srcdir)/kexi/Makefile.global
-#
-#kde_module_LTLIBRARIES = kexidb_mysqldriver.la
-#
-#INCLUDES = -I$(MYSQL_INC) -I$(srcdir)/../../.. \
-#  -I$(srcdir)/../..  \
-#  -I$(top_srcdir)/kexi $(all_includes)
-#
-#kexidb_mysqldriver_la_METASOURCES = AUTO
-#
-#kexidb_mysqldriver_la_SOURCES = \
-#  mysqldriver.cpp \
-#  mysqlconnection.cpp \
-#  mysqlconnection_p.cpp \
-#  mysqlcursor.cpp \
-#  mysqlkeywords.cpp \
-#  mysqlpreparedstatement.cpp
-#
-#kexidb_mysqldriver_la_LIBADD = $(LIB_KPARTS) \
-#  $(LIB_QT) \
-#  $(MYSQL_LIBS) \
-#  -lmysqlclient \
-#  ../../libkexidb.la
-#
-#kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) \
                -no-undefined
-#
-#
-#kde_services_DATA = kexidb_mysqldriver.desktop
-#
-#
-#KDE_CXXFLAGS += -DKEXIDB_MYSQL_DRIVER_EXPORT= -D__KEXIDB__= \
-#	-include $(top_srcdir)/kexi/kexidb/global.h
-#
diff --git a/kexi/kexidb/drivers/odbc/CMakeLists.txt \
b/kexi/kexidb/drivers/odbc/CMakeLists.txt index d4498aa..d554be9 100644
--- a/kexi/kexidb/drivers/odbc/CMakeLists.txt
+++ b/kexi/kexidb/drivers/odbc/CMakeLists.txt
@@ -21,7 +21,7 @@ set(kexidb_odbcdriver_PART_SRCS kodbcdriver.cpp
 
 kde4_add_plugin(kexidb_odbcdriver ${kexidb_odbcdriver_PART_SRCS})
 
-target_link_libraries(kexidb_odbcdriver ${KDE4_KPARTS_LIBS} odbc kexidb )
+target_link_libraries(kexidb_odbcdriver odbc kexidb )
 
 install(TARGETS kexidb_odbcdriver  DESTINATION ${PLUGIN_INSTALL_DIR})
 
diff --git a/kexi/kexidb/drivers/oracle/CMakeLists.txt \
b/kexi/kexidb/drivers/oracle/CMakeLists.txt index 3fdf6be..08ca310 100644
--- a/kexi/kexidb/drivers/oracle/CMakeLists.txt
+++ b/kexi/kexidb/drivers/oracle/CMakeLists.txt
@@ -22,7 +22,7 @@ kde4_add_plugin(kexidb_oracledriver \
${kexidb_oracledriver_PART_SRCS})  
 
 target_link_libraries(kexidb_oracledriver ${ORACLE_LIBRARIES} 
- ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} kexidb occi clntsh)
+ ${KDE4_KDECORE_LIBS} kexidb occi clntsh)
 
 install(TARGETS kexidb_oracledriver  DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -30,42 +30,3 @@ install(TARGETS kexidb_oracledriver  DESTINATION \
${PLUGIN_INSTALL_DIR})  ########### install files ###############
 
 install( FILES  kexidb_oracledriver.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
-
-#original Makefile.am contents follow:
-
-#include $(top_srcdir)/kexi/Makefile.global
-#
-#kde_module_LTLIBRARIES = kexidb_oracledriver.la
-#
-#INCLUDES = -I$(ORACLE_INC) -I$(srcdir)/../../.. \
-#  -I$(srcdir)/../..  \
-#  -I$(top_srcdir)/kexi $(all_includes) \
-#  -I/usr/include/oracle/11.1.0.1/client 
-#
-#kexidb_oracledriver_la_METASOURCES = AUTO
-#
-#kexidb_oracledriver_la_SOURCES = \
-#  oracledriver.cpp \
-#  oracleconnection.cpp \
-#  oracleconnection_p.cpp \
-#  oraclecursor.cpp \
-#  oraclekeywords.cpp \
-#  oraclepreparedstatement.cpp
-#
-#kexidb_oracledriver_la_LIBADD = $(LIB_KPARTS) \
-#  $(LIB_QT) \
-#  $(ORACLE_LIBS) \
-#  -locci \
-#  -lclntsh \
-#  -L/usr/lib/oracle/11.1.0.1/client/lib \
-#  ../../libkexidb.la
-#
-#kexidb_oracledriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) \
                -no-undefined
-#
-#
-#kde_services_DATA = kexidb_oracledriver.desktop
-#
-#
-#KDE_CXXFLAGS += -DKEXIDB_ORACLE_DRIVER_EXPORT= -D__KEXIDB__= \
-#	-include $(top_srcdir)/kexi/kexidb/global.h
-#
diff --git a/kexi/kexidb/drivers/pqxx/CMakeLists.txt \
b/kexi/kexidb/drivers/pqxx/CMakeLists.txt index d7f4511..2df3374 100644
--- a/kexi/kexidb/drivers/pqxx/CMakeLists.txt
+++ b/kexi/kexidb/drivers/pqxx/CMakeLists.txt
@@ -21,7 +21,7 @@ kde4_add_plugin(kexidb_pqxxsqldriver \
${kexidb_pqxxsqldriver_PART_SRCS})  
 
 target_link_libraries(kexidb_pqxxsqldriver ${POSTGRESQL_LIBRARIES} ${PQXX_LIBRARIES} \
                
- ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${CALLIGRADB_LIBS} kexidb)
+ ${KDE4_KDECORE_LIBS} ${CALLIGRADB_LIBS} kexidb)
 
 install(TARGETS kexidb_pqxxsqldriver  DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -29,32 +29,3 @@ install(TARGETS kexidb_pqxxsqldriver  DESTINATION \
${PLUGIN_INSTALL_DIR})  ########### install files ###############
 
 install( FILES  kexidb_pqxxsqldriver.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
-
-
-
-
-
-#original Makefile.am contents follow:
-
-#include $(top_srcdir)/kexi/Makefile.global
-#
-#kde_module_LTLIBRARIES = kexidb_pqxxsqldriver.la
-#
-#INCLUDES = -I$(srcdir)/../../.. $(all_includes) -I$(PG_INCDIR) -I$(PQXX_INCDIR)
-#
-#kexidb_pqxxsqldriver_la_METASOURCES = AUTO
-#
-#kexidb_pqxxsqldriver_la_SOURCES = pqxxdriver.cpp pqxxcursor.cpp pqxxconnection.cpp \
                \
-#	pqxxkeywords.cpp pqxxconnection_p.cpp pqxxpreparedstatement.cpp
-#
-#kexidb_pqxxsqldriver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lpqxx ../../libkexidb.la
-#
-#kexidb_pqxxsqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) \
-#	-L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined
-#
-#kde_services_DATA = kexidb_pqxxsqldriver.desktop
-#
-#noinst_HEADERS =  pqxxconnection.h pqxxconnection_p.h
-#
-#KDE_CXXFLAGS += -DKEXIDB_PGSQL_DRIVER_EXPORT= -D__KEXIDB__= \
-#	-include $(top_srcdir)/kexi/kexidb/global.h
diff --git a/kexi/kexidb/drivers/sybase/CMakeLists.txt \
b/kexi/kexidb/drivers/sybase/CMakeLists.txt index f2ba3de..1a23da9 100644
--- a/kexi/kexidb/drivers/sybase/CMakeLists.txt
+++ b/kexi/kexidb/drivers/sybase/CMakeLists.txt
@@ -19,7 +19,7 @@ set(kexidb_sybasedriver_PART_SRCS
 kde4_add_plugin(kexidb_sybasedriver ${kexidb_sybasedriver_PART_SRCS})
 
 target_link_libraries(kexidb_sybasedriver ${FreeTDS_LIBRARIES}
- ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${CALLIGRADB_LIBS} kexidb)
+ ${KDE4_KDECORE_LIBS} ${CALLIGRADB_LIBS} kexidb)
 
 install(TARGETS kexidb_sybasedriver  DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -27,43 +27,3 @@ install(TARGETS kexidb_sybasedriver  DESTINATION \
${PLUGIN_INSTALL_DIR})  ########### install files ###############
 
 install( FILES  kexidb_sybasedriver.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
-
-
-
-
-
-#original Makefile.am contents follow:
-
-#include $(top_srcdir)/kexi/Makefile.global
-#
-#kde_module_LTLIBRARIES = kexidb_mysqldriver.la
-#
-#INCLUDES = -I$(MYSQL_INC) -I$(srcdir)/../../.. \
-#  -I$(srcdir)/../..  \
-#  -I$(top_srcdir)/kexi $(all_includes)
-#
-#kexidb_mysqldriver_la_METASOURCES = AUTO
-#
-#kexidb_mysqldriver_la_SOURCES = \
-#  mysqldriver.cpp \
-#  mysqlconnection.cpp \
-#  mysqlconnection_p.cpp \
-#  mysqlcursor.cpp \
-#  mysqlkeywords.cpp \
-#  mysqlpreparedstatement.cpp
-#
-#kexidb_mysqldriver_la_LIBADD = $(LIB_KPARTS) \
-#  $(LIB_QT) \
-#  $(MYSQL_LIBS) \
-#  -lmysqlclient \
-#  ../../libkexidb.la
-#
-#kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) \
                -no-undefined
-#
-#
-#kde_services_DATA = kexidb_mysqldriver.desktop
-#
-#
-#KDE_CXXFLAGS += -DKEXIDB_MYSQL_DRIVER_EXPORT= -D__KEXIDB__= \
-#	-include $(top_srcdir)/kexi/kexidb/global.h
-#
diff --git a/kexi/kexidb/drivers/xbase/CMakeLists.txt \
b/kexi/kexidb/drivers/xbase/CMakeLists.txt index f1f6042..10f3933 100644
--- a/kexi/kexidb/drivers/xbase/CMakeLists.txt
+++ b/kexi/kexidb/drivers/xbase/CMakeLists.txt
@@ -26,7 +26,6 @@ target_link_libraries(
     ${CALLIGRADB_LIBS}
     ${XBase_LIBRARIES}
     ${KDE4_KDECORE_LIBS}
-    ${KDE4_KPARTS_LIBS}
     )
 
 install(TARGETS kexidb_xbasedriver  DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp
index c02ee81..d3f09af 100644
--- a/kexi/main/kexistatusbar.cpp
+++ b/kexi/main/kexistatusbar.cpp
@@ -30,7 +30,6 @@
 #include <KMenu>
 #include <KDebug>
 #include <KLocale>
-#include <kparts/part.h>
 
 #if KexiStatusBar_KTEXTEDITOR_USED
 #include <ktexteditor/viewcursorinterface.h>
@@ -59,7 +58,6 @@ KexiStatusBar::KexiStatusBar(QWidget *parent)
 #if KexiStatusBar_KTEXTEDITOR_USED
         , m_cursorIface(0)
 #endif
-        , m_activePart(0)
 {
     setObjectName("KexiStatusBar");
     setContentsMargins(2, 0, 2, 0);
@@ -101,32 +99,6 @@ KexiStatusBar::~KexiStatusBar()
 {
 }
 
-void KexiStatusBar::activePartChanged(KParts::Part *part)
-{
-    if (m_activePart && m_activePart->widget())
-        disconnect(m_activePart->widget(), 0, this, 0);
-
-    m_activePart = part;
-#if KexiStatusBar_KTEXTEDITOR_USED
-    m_cursorIface = 0;
-    m_viewmsgIface = 0;
-// @todo
-    if (part && part->widget()) {
-        if ((m_viewmsgIface = \
                dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) \
                {
-            connect(part->widget(), SIGNAL(viewStatusMsg(QString)),
-                    this, SLOT(setStatus(QString)));
-        } else if ((m_cursorIface = \
                dynamic_cast<KTextEditor::ViewCursorInterface*>(part->widget()))) {
-            connect(part->widget(), SIGNAL(cursorPositionChanged()), this, \
                SLOT(cursorPositionChanged()));
-            cursorPositionChanged();
-        } else {
-            // we can't produce any status data, hide the status box
-            changeItem("", m_msgID);
-        }
-    }
-#endif
-}
-
-
 void KexiStatusBar::cursorPositionChanged()
 {
 #if KexiStatusBar_KTEXTEDITOR_USED
diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h
index 4450a8d..4ded7b3 100644
--- a/kexi/main/kexistatusbar.h
+++ b/kexi/main/kexistatusbar.h
@@ -38,10 +38,6 @@ namespace KTextEditor
     class ViewCursorInterface;
 }
 #endif
-namespace KParts
-{
-    class Part;
-}
 
 class KexiStatusBar : public KStatusBar
 {
@@ -63,7 +59,6 @@ signals:
 
 protected slots:
     void cursorPositionChanged();
-    void activePartChanged(KParts::Part *part);
     void setCursorPosition(int line, int col);
 
 protected:
@@ -74,7 +69,6 @@ protected:
     KTextEditor::ViewCursorInterface * m_cursorIface;
     KTextEditor::ViewStatusMsgInterface * m_viewmsgIface;
 #endif
-    KParts::Part *m_activePart;
     KMenu *m_viewMenu;
 };
 
diff --git a/kexi/migration/mdb/src/CMakeLists.txt \
b/kexi/migration/mdb/src/CMakeLists.txt index f00577b..7f08317 100644
--- a/kexi/migration/mdb/src/CMakeLists.txt
+++ b/kexi/migration/mdb/src/CMakeLists.txt
@@ -35,7 +35,6 @@ kde4_add_plugin(keximigrate_mdb \
${keximigrate_mdbmigrate_PART_SRCS})  
 
 target_link_libraries(keximigrate_mdb
-${KDE4_KPARTS_LIBS}
 ${GLIB2_LIBRARIES}
 ${ICONV_LIBRARIES}
 keximigrate
diff --git a/kexi/migration/migratemanager_p.h b/kexi/migration/migratemanager_p.h
index 060a02d..5bc939e 100644
--- a/kexi/migration/migratemanager_p.h
+++ b/kexi/migration/migratemanager_p.h
@@ -72,8 +72,6 @@ protected:
     QString m_serverErrMsg;
     int m_serverResultNum;
     QString m_serverResultName;
-    //! result names for KParts::ComponentFactory::ComponentLoadingError
-    //QMap<int, QString> m_componentLoadingErrors;
 
     bool lookupDriversNeeded : 1;
 
diff --git a/kexi/migration/mysql/CMakeLists.txt \
b/kexi/migration/mysql/CMakeLists.txt index 025f16a..b04acf8 100644
--- a/kexi/migration/mysql/CMakeLists.txt
+++ b/kexi/migration/mysql/CMakeLists.txt
@@ -15,7 +15,6 @@ target_link_libraries(
     kexiutils
     ${CALLIGRADB_LIBS}
     ${KDE4_KDECORE_LIBS}
-    ${KDE4_KPARTS_LIBS}
     ${MYSQL_LIBRARIES}
     )
 
@@ -25,28 +24,3 @@ install(TARGETS keximigrate_mysql  DESTINATION \
${PLUGIN_INSTALL_DIR})  ########### install files ###############
 
 install( FILES  keximigrate_mysql.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
-
-
-
-
-
-#original Makefile.am contents follow:
-
-#include $(top_srcdir)/kexi/Makefile.global
-#
-#kde_module_LTLIBRARIES = keximigrate_mysql.la
-#
-#INCLUDES = -I$(srcdir)/../../.. -I$(top_srcdir)/kexi $(all_includes) -I$(MYSQL_INC)
-#
-#keximigrate_mysql_la_METASOURCES = AUTO
-#
-#keximigrate_mysql_la_SOURCES = mysqlmigrate.cpp
-#
-#keximigrate_mysql_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) ../libkeximigrate.la \
                $(MYSQL_LIBS) -lmysqlclient
-#
-#keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) \
                -no-undefined
-#
-#kde_services_DATA = keximigrate_mysql.desktop
-#
-#noinst_HEADERS =  mysqlmigrate.h
-#
diff --git a/kexi/migration/pqxx/CMakeLists.txt b/kexi/migration/pqxx/CMakeLists.txt
index 6712542..2136d17 100644
--- a/kexi/migration/pqxx/CMakeLists.txt
+++ b/kexi/migration/pqxx/CMakeLists.txt
@@ -15,7 +15,6 @@ target_link_libraries(
     ${POSTGRESQL_LIBRARIES} 
     ${PQXX_LIBRARIES} 
     ${KDE4_KDECORE_LIBS} 
-    ${KDE4_KPARTS_LIBS} 
     keximigrate 
     kexidb
     kexiutils
@@ -28,30 +27,3 @@ install(TARGETS keximigrate_pqxx  DESTINATION \
${PLUGIN_INSTALL_DIR})  ########### install files ###############
 
 install( FILES  keximigrate_pqxx.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
-
-
-
-
-
-#original Makefile.am contents follow:
-
-#include $(top_srcdir)/kexi/Makefile.global
-#
-#kde_module_LTLIBRARIES = keximigrate_pqxx.la
-#
-#INCLUDES = -I$(srcdir)/../../.. -I$(top_srcdir)/kexi $(all_includes) -I$(PG_INCDIR) \
                -I$(PQXX_INCDIR)
-#
-#keximigrate_pqxx_la_METASOURCES = AUTO
-#
-#keximigrate_pqxx_la_SOURCES = pqxxmigrate.cpp
-#
-##TODO share -libs with pqxx kexidb drv!
-##keximigrate_pqxx_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lcom_err -lkrb5 -lssl \
                -lcrypto -lcrypt -lpqxx ../libkeximigrate.la
-#keximigrate_pqxx_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lpqxx ../libkeximigrate.la
-#
-#keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) \
                -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined
-#
-#kde_services_DATA = keximigrate_pqxx.desktop
-#
-#noinst_HEADERS =  pqxxmigrate.h pg_type.h
-#
diff --git a/kexi/migration/sybase/CMakeLists.txt \
b/kexi/migration/sybase/CMakeLists.txt index ee09df1..684da55 100644
--- a/kexi/migration/sybase/CMakeLists.txt
+++ b/kexi/migration/sybase/CMakeLists.txt
@@ -9,7 +9,7 @@ kde4_add_plugin(keximigrate_sybase ${keximigrate_sybase_PART_SRCS})
 
 
 target_link_libraries(keximigrate_sybase ${FreeTDS_LIBRARIES} ${KDE4_KDECORE_LIBS}
- ${KDE4_KPARTS_LIBS} kexiutils kexidb keximigrate ${CALLIGRADB_LIBS})
+                      kexiutils kexidb keximigrate ${CALLIGRADB_LIBS})
 
 install(TARGETS keximigrate_sybase  DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -17,28 +17,3 @@ install(TARGETS keximigrate_sybase  DESTINATION \
${PLUGIN_INSTALL_DIR})  ########### install files ###############
 
 install( FILES  keximigrate_sybase.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
-
-
-
-
-
-#original Makefile.am contents follow:
-
-#include $(top_srcdir)/kexi/Makefile.global
-#
-#kde_module_LTLIBRARIES = keximigrate_mysql.la
-#
-#INCLUDES = -I$(srcdir)/../../.. -I$(top_srcdir)/kexi $(all_includes) -I$(MYSQL_INC)
-#
-#keximigrate_mysql_la_METASOURCES = AUTO
-#
-#keximigrate_mysql_la_SOURCES = mysqlmigrate.cpp
-#
-#keximigrate_mysql_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) ../libkeximigrate.la \
                $(MYSQL_LIBS) -lmysqlclient
-#
-#keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) \
                -no-undefined
-#
-#kde_services_DATA = keximigrate_mysql.desktop
-#
-#noinst_HEADERS =  mysqlmigrate.h
-#
diff --git a/kexi/migration/txt/CMakeLists.txt b/kexi/migration/txt/CMakeLists.txt
index da90f3e..c3514f7 100644
--- a/kexi/migration/txt/CMakeLists.txt
+++ b/kexi/migration/txt/CMakeLists.txt
@@ -13,7 +13,6 @@ kde4_add_plugin(keximigrate_txt \
${keximigrate_txtmigrate_PART_SRCS})  
 
 target_link_libraries(keximigrate_txt  
-    ${KDE4_KPARTS_LIBS} 
     keximigrate
     kexidb
     kexiutils
diff --git a/kexi/migration/xbase/CMakeLists.txt \
b/kexi/migration/xbase/CMakeLists.txt index 9f6187c..c915b92 100644
--- a/kexi/migration/xbase/CMakeLists.txt
+++ b/kexi/migration/xbase/CMakeLists.txt
@@ -13,7 +13,6 @@ target_link_libraries(
     kexidb
     kexiutils
     ${CALLIGRADB_LIBS}
-    ${KDE4_KPARTS_LIBS}
     ${KDE4_KDECORE_LIBS}
     ${XBase_LIBRARIES} 
     )
diff --git a/kexi/plugins/autoforms/CMakeLists.txt \
b/kexi/plugins/autoforms/CMakeLists.txt index 239b4f8..b703bef 100644
--- a/kexi/plugins/autoforms/CMakeLists.txt
+++ b/kexi/plugins/autoforms/CMakeLists.txt
@@ -24,7 +24,6 @@ kde4_add_plugin(kexihandler_autoform ${kexihandler_autoform_SRCS})
 target_link_libraries(kexihandler_autoform
     ${KDE4_KDEUI_LIBS}
     ${QT_QTGUI_LIBRARY}
-    ${KDE4_KPARTS_LIBS}
     kexidb
     kexicore
     kexiextendedwidgets
diff --git a/kexi/plugins/reports/CMakeLists.txt \
b/kexi/plugins/reports/CMakeLists.txt index b932dee..14e0ff9 100644
--- a/kexi/plugins/reports/CMakeLists.txt
+++ b/kexi/plugins/reports/CMakeLists.txt
@@ -43,7 +43,6 @@ target_link_libraries(kexihandler_report
     ${KDE4_KDEUI_LIBS}
     ${QT_QTGUI_LIBRARY}
     ${QT_QTSCRIPT_LIBRARY}
-    ${KDE4_KPARTS_LIBS}
     kexidb
     ${CALLIGRADB_LIBS}
     kexicore
diff --git a/libs/db/CMakeLists.txt b/libs/db/CMakeLists.txt
index 0840047..c0d99e8 100644
--- a/libs/db/CMakeLists.txt
+++ b/libs/db/CMakeLists.txt
@@ -78,8 +78,11 @@ set(calligradb_LIB_SRCS
 )
 
 kde4_add_library(calligradb SHARED ${calligradb_LIB_SRCS})
-target_link_libraries(calligradb
-   ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KPARTS_LIBS})
+target_link_libraries(calligradb ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
+                                 ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} \
${KDE4_KIO_LIBS}) +
+target_link_libraries(calligradb LINK_INTERFACE_LIBRARIES ${QT_QTCORE_LIBRARY} \
${QT_QTGUI_LIBRARY} +                                 ${KDE4_KDECORE_LIBS} \
${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})  
 set_target_properties(calligradb PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} \
SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} )  
diff --git a/libs/db/drivermanager_p.h b/libs/db/drivermanager_p.h
index d20f82f..7e84b6f 100644
--- a/libs/db/drivermanager_p.h
+++ b/libs/db/drivermanager_p.h
@@ -79,8 +79,6 @@ protected:
     QString m_serverErrMsg;
     int m_serverResultNum;
     QString m_serverResultName;
-    //! result names for KParts::ComponentFactory::ComponentLoadingError
-    //QHash<int, QString> m_componentLoadingErrors;
 
     QStringList possibleProblems;
 
diff --git a/libs/db/drivers/sqlite/CMakeLists.txt \
b/libs/db/drivers/sqlite/CMakeLists.txt index 870b038..c4deb6b 100644
--- a/libs/db/drivers/sqlite/CMakeLists.txt
+++ b/libs/db/drivers/sqlite/CMakeLists.txt
@@ -19,7 +19,7 @@ set(kexidb_sqlite3driver_PART_SRCS
 
 kde4_add_plugin(kexidb_sqlite3driver ${kexidb_sqlite3driver_PART_SRCS})
 
-target_link_libraries(kexidb_sqlite3driver ${KDE4_KPARTS_LIBS} ${SQLITE_LIBRARIES} \
${CALLIGRADB_LIBS}) +target_link_libraries(kexidb_sqlite3driver ${SQLITE_LIBRARIES} \
${CALLIGRADB_LIBS})  
 install(TARGETS kexidb_sqlite3driver  DESTINATION ${PLUGIN_INSTALL_DIR})
 


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic