[Kget] branches/work/make_kget_cool

[Pino Toscano]

SVN commit 535368 by pino:

Convert the kget build system to cmake. (Note that the autostuff is still there.)
All compiles and link fine, execept for the bittorrent transfer plugin (still needed at that shape?) and the Konqueror plugin (will come soon).
Now there is a libkgetcore, and both the main kget executable and the plugins link to it (this solution is needed as there are no libtool convenience libraries anymore).

If you have any issue, let me know so I'll fix it.

CCMAIL: kget at kde.org


 A             CMakeLists.txt  
 A             ConfigureChecks.cmake  
 A             cmake (directory)  
 A             cmake/CMakeLists.txt  
 A             cmake/modules (directory)  
 A             cmake/modules/CMakeLists.txt  
 A             config.h.cmake  
 A             kget/CMakeLists.txt  
 A             kget/conf/CMakeLists.txt  
 M  +10 -4     kget/conf/preferencesdialog.cpp  
 M  +0 -8      kget/conf/preferencesdialog.h  
 A             kget/core/CMakeLists.txt  
 M  +1 -1      kget/core/connection.cpp  
 M  +1 -1      kget/core/model.cpp  
 A             kget/core/plugin/CMakeLists.txt  
 M  +1 -1      kget/kget.cpp  
 M  +1 -1      kget/main.cpp  
 A             kget/sounds/CMakeLists.txt  
 A             kget/transfers/CMakeLists.txt  
 A             kget/transfers/kio/CMakeLists.txt  
 A             kget/transfers/multithreaded/CMakeLists.txt  
 M  +1 -1      kget/transfers/multithreaded/mtdetailswidget.cpp  
 M  +1 -1      kget/transfers/multithreaded/mtdetailswidget.h  
 M  +1 -1      kget/transfers/multithreaded/transferMultiThreaded.cpp  
 A             kget/ui/CMakeLists.txt  
 M  +1 -1      kget/ui/droptarget.cpp  
 A             kget/ui/icons/CMakeLists.txt  
 A             kget/ui/pics/CMakeLists.txt  
 M  +1 -1      kget/ui/transferdetails.cpp  
 M  +1 -1      kget/ui/traytransfer.cpp  
 M  +1 -1      kget/ui/traytransfer.h  


--- branches/work/make_kget_cool/kget/conf/preferencesdialog.cpp #535367:535368
@@ -12,6 +12,12 @@
 // reimplementing this
 #include "preferencesdialog.h"
 
+// single config pages
+#include "ui_dlgappearance.h"
+#include "ui_dlgnetwork.h"
+#include "ui_dlgdirectories.h"
+#include "ui_dlgadvanced.h"
+
 PreferencesDialog::PreferencesDialog( QWidget * parent, KConfigSkeleton * skeleton )
     : KConfigDialog( parent, "preferences", skeleton )
 {
@@ -20,10 +26,10 @@
     directories = new QWidget(this);
     advanced = new QWidget(this);
 
-    DlgAppearance dlgApp;
-    DlgNetwork dlgNet;
-    DlgDirectories dlgDir;
-    DlgAdvanced dlgAdv;
+    Ui::DlgAppearance dlgApp;
+    Ui::DlgNetwork dlgNet;
+    Ui::DlgDirectories dlgDir;
+    Ui::DlgAdvanced dlgAdv;
 
     dlgApp.setupUi(appearance);
     dlgNet.setupUi(network);
--- branches/work/make_kget_cool/kget/conf/preferencesdialog.h #535367:535368
@@ -12,14 +12,6 @@
 
 #include <kconfigdialog.h>
 
-// single config pages
-#include "dlgappearance.h"
-#include "dlgnetwork.h"
-#include "dlgdirectories.h"
-#include "dlgadvanced.h"
-
-using namespace Ui;
-
 class QWidget;
 class KConfigSkeleton;
 
--- branches/work/make_kget_cool/kget/core/connection.cpp #535367:535368
@@ -24,7 +24,7 @@
 #endif
 
 #include "connection.h"
-#include "conf/settings.h"
+#include "settings.h"
 
 QString ConnectionDevices[6] = {
     "",
--- branches/work/make_kget_cool/kget/core/model.cpp #535367:535368
@@ -27,7 +27,7 @@
 #include "core/plugin/plugin.h"
 #include "core/plugin/transferfactory.h"
 #include "core/observer.h"
-#include "conf/settings.h"
+#include "settings.h"
 
 /**
  * This is our Model class. This is where the user's transfers and searches are
--- branches/work/make_kget_cool/kget/kget.cpp #535367:535368
@@ -28,7 +28,7 @@
 #include "kget.h"
 #include "core/model.h"
 #include "core/transferhandler.h"
-#include "conf/settings.h"
+#include "settings.h"
 #include "conf/preferencesdialog.h"
 
 #include "ui/sidebar.h"
--- branches/work/make_kget_cool/kget/main.cpp #535367:535368
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 
 #include "core/model.h"
-#include "conf/settings.h"
+#include "settings.h"
 #include "ui/splash.h"
 #include "kget.h"
 
--- branches/work/make_kget_cool/kget/transfers/multithreaded/mtdetailswidget.cpp #535367:535368
@@ -11,7 +11,7 @@
 #include "mtdetailswidget.h"
 #include "mtdetailswidget.moc"
 
-#include "conf/settings.h"
+#include "settings.h"
 
 MTDetailsWidget::MTDetailsWidget()
 {
--- branches/work/make_kget_cool/kget/transfers/multithreaded/mtdetailswidget.h #535367:535368
@@ -13,7 +13,7 @@
 
 #include <QWidget>
 
-#include "mtdetailswidgetfrm.h"
+#include "ui_mtdetailswidgetfrm.h"
 
 class MTDetailsWidget : public QWidget
 {
--- branches/work/make_kget_cool/kget/transfers/multithreaded/transferMultiThreaded.cpp #535367:535368
@@ -16,7 +16,7 @@
 #include <kio/job.h>
 #include <kdebug.h>
 
-#include "conf/settings.h"
+#include "settings.h"
 
 #include "transferMultiThreaded.h"
 #include "transferMultiThreaded.moc"
--- branches/work/make_kget_cool/kget/ui/droptarget.cpp #535367:535368
@@ -24,7 +24,7 @@
 #include <math.h>
 
 #include "core/model.h"
-#include "conf/settings.h"
+#include "settings.h"
 #include "ui/droptarget.h"
 #include "kget.h"
 
--- branches/work/make_kget_cool/kget/ui/transferdetails.cpp #535367:535368
@@ -16,7 +16,7 @@
 #include "core/model.h"
 
 #include "transferdetails.h"
-#include "transferdetailsfrm.h"
+#include "ui_transferdetailsfrm.h"
 
 TransferDetails::TransferDetails(TransferHandler * transfer)
     : m_transfer(transfer)
--- branches/work/make_kget_cool/kget/ui/traytransfer.cpp #535367:535368
@@ -12,7 +12,7 @@
 
 #include "traytransfer.h"
 
-TrayTransfer::TrayTransfer(QWidget *parent, const char *name ) : KSystemTray(parent,name)
+TrayTransfer::TrayTransfer(QWidget *parent) : KSystemTray(parent)
 {
     nPic=0;
     setPixmap( loadIcon("bar0") );
--- branches/work/make_kget_cool/kget/ui/traytransfer.h #535367:535368
@@ -20,7 +20,7 @@
 class TrayTransfer : public KSystemTray  {
     Q_OBJECT
 public:
-    TrayTransfer(QWidget *parent=0, const char *name=0);
+    TrayTransfer(QWidget *parent=0);
     ~TrayTransfer();
     int nPic;
     void setTip(const QString &);