[Kde-hardware-devel] Solid: Patch to solve the problem with solid_export.h on kdebase

Thu, 10 May 2007 11:49:46 -0700 

This problem has been discussed on IRC. In short, the solid_export.h
on kdebase must be moved, renamed and installed, also some little
refactoring is needed to adapt the code in kdebase/solid/control to
that change.

Attached patch assumes the file
kdebase/runtime/solid/control/solid/solid_export.h is moved to
kdebase/runtime/solid/control/solid/control/solid_control_export.h.

Regards

PS: Btw, i'm new here so: Hi list!!

Index: kdebase/runtime/solid/control/solid/control/ifaces/network.h
===================================================================
--- kdebase/runtime/solid/control/solid/control/ifaces/network.h        
(revisión: 660385)
+++ kdebase/runtime/solid/control/solid/control/ifaces/network.h        (copia 
de trabajo)
@@ -20,7 +20,7 @@
 #ifndef SOLID_IFACES_NETWORK_H
 #define SOLID_IFACES_NETWORK_H
 
-#include <solid/solid_export.h>
+#include <solid/control/solid_control_export.h>
 
 #include <QtCore/QObject>
 #include <QtCore/QList>
Index: kdebase/runtime/solid/control/solid/control/ifaces/bluetoothmanager.h
===================================================================
--- kdebase/runtime/solid/control/solid/control/ifaces/bluetoothmanager.h       
(revisión: 660385)
+++ kdebase/runtime/solid/control/solid/control/ifaces/bluetoothmanager.h       
(copia de trabajo)
@@ -23,7 +23,7 @@
 #define SOLID_IFACES_BLUETOOTHMANAGER
 
 #include <QObject>
-#include <solid/solid_export.h>
+#include <solid/control/solid_control_export.h>
 
 class KJob;
 
Index: 
kdebase/runtime/solid/control/solid/control/ifaces/bluetoothremotedevice.h
===================================================================
--- kdebase/runtime/solid/control/solid/control/ifaces/bluetoothremotedevice.h  
(revisión: 660385)
+++ kdebase/runtime/solid/control/solid/control/ifaces/bluetoothremotedevice.h  
(copia de trabajo)
@@ -23,7 +23,7 @@
 #define SOLID_IFACES_BLUETOOTHREMOTEDEVICE
 
 #include <QObject>
-#include <solid/solid_export.h>
+#include <solid/control/solid_control_export.h>
 
 class KJob;
 
Index: kdebase/runtime/solid/control/solid/control/ifaces/bluetoothinputdevice.h
===================================================================
--- kdebase/runtime/solid/control/solid/control/ifaces/bluetoothinputdevice.h   
(revisión: 660385)
+++ kdebase/runtime/solid/control/solid/control/ifaces/bluetoothinputdevice.h   
(copia de trabajo)
@@ -23,7 +23,7 @@
 #define SOLID_IFACES_BLUETOOTHINPUTDEVICE
 
 #include <QObject>
-#include <solid/solid_export.h>
+#include <solid/control/solid_control_export.h>
 
 namespace Solid
 {
Index: kdebase/runtime/solid/control/solid/control/ifaces/wirelessnetwork.h
===================================================================
--- kdebase/runtime/solid/control/solid/control/ifaces/wirelessnetwork.h        
(revisión: 660385)
+++ kdebase/runtime/solid/control/solid/control/ifaces/wirelessnetwork.h        
(copia de trabajo)
@@ -20,7 +20,7 @@
 #ifndef SOLID_IFACES_WIRELESSNETWORK_H
 #define SOLID_IFACES_WIRELESSNETWORK_H
 
-#include <solid/solid_export.h>
+#include <solid/control/solid_control_export.h>
 
 #include <QStringList>
 
Index: kdebase/runtime/solid/control/solid/control/ifaces/networkinterface.h
===================================================================
--- kdebase/runtime/solid/control/solid/control/ifaces/networkinterface.h       
(revisión: 660385)
+++ kdebase/runtime/solid/control/solid/control/ifaces/networkinterface.h       
(copia de trabajo)
@@ -21,7 +21,7 @@
 #define SOLID_IFACES_NETWORKINTERFACE_H
 
 #include <QList>
-#include <solid/solid_export.h>
+#include <solid/control/solid_control_export.h>
 
 #include <solid/control/networkinterface.h>
 
Index: kdebase/runtime/solid/control/solid/control/ifaces/authentication.h
===================================================================
--- kdebase/runtime/solid/control/solid/control/ifaces/authentication.h 
(revisión: 660385)
+++ kdebase/runtime/solid/control/solid/control/ifaces/authentication.h (copia 
de trabajo)
@@ -24,7 +24,7 @@
 #include <QMap>
 #include <QString>
 
-#include <solid/solid_export.h>
+#include <solid/control/solid_control_export.h>
 
 namespace Solid
 {
Index: kdebase/runtime/solid/control/solid/control/ifaces/networkmanager.h
===================================================================
--- kdebase/runtime/solid/control/solid/control/ifaces/networkmanager.h 
(revisión: 660385)
+++ kdebase/runtime/solid/control/solid/control/ifaces/networkmanager.h (copia 
de trabajo)
@@ -21,7 +21,7 @@
 #define SOLID_IFACES_NETWORKMANAGER
 
 #include <QObject>
-#include <solid/solid_export.h>
+#include <solid/control/solid_control_export.h>
 
 namespace Solid
 {
Index: kdebase/runtime/solid/control/solid/control/ifaces/bluetoothinterface.h
===================================================================
--- kdebase/runtime/solid/control/solid/control/ifaces/bluetoothinterface.h     
(revisión: 660385)
+++ kdebase/runtime/solid/control/solid/control/ifaces/bluetoothinterface.h     
(copia de trabajo)
@@ -23,7 +23,7 @@
 #define SOLID_IFACES_BLUETOOTHINTERFACE_H
 
 #include <QList>
-#include <solid/solid_export.h>
+#include <solid/control/solid_control_export.h>
 
 #include <solid/control/bluetoothinterface.h>
 #include <solid/control/ifaces/bluetoothremotedevice.h>
Index: kdebase/runtime/solid/control/solid/control/ifaces/powermanager.h
===================================================================
--- kdebase/runtime/solid/control/solid/control/ifaces/powermanager.h   
(revisión: 660385)
+++ kdebase/runtime/solid/control/solid/control/ifaces/powermanager.h   (copia 
de trabajo)
@@ -23,7 +23,7 @@
 #include <QObject>
 #include <QStringList>
 
-#include <solid/solid_export.h>
+#include <solid/control/solid_control_export.h>
 
 #include <solid/control/powermanager.h>
 
Index: kdebase/runtime/solid/control/solid/control/networkmanager.h
===================================================================
--- kdebase/runtime/solid/control/solid/control/networkmanager.h        
(revisión: 660385)
+++ kdebase/runtime/solid/control/solid/control/networkmanager.h        (copia 
de trabajo)
@@ -23,7 +23,7 @@
 
 #include <QtCore/QObject>
 
-#include <solid/solid_export.h>
+#include <solid/control/solid_control_export.h>
 
 namespace Solid
 {
Index: kdebase/runtime/solid/control/solid/control/powermanager.h
===================================================================
--- kdebase/runtime/solid/control/solid/control/powermanager.h  (revisión: 
660385)
+++ kdebase/runtime/solid/control/solid/control/powermanager.h  (copia de 
trabajo)
@@ -22,7 +22,7 @@
 
 #include <QtCore/QObject>
 
-#include <solid/solid_export.h>
+#include <solid/control/solid_control_export.h>
 
 class KJob;
 
Index: kdebase/runtime/solid/control/solid/control/CMakeLists.txt
===================================================================
--- kdebase/runtime/solid/control/solid/control/CMakeLists.txt  (revisión: 
660385)
+++ kdebase/runtime/solid/control/solid/control/CMakeLists.txt  (copia de 
trabajo)
@@ -35,5 +35,6 @@
 install( FILES solidpowermanager.desktop solidnetworkmanager.desktop 
solidbluetoothmanager.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}  )
 install( FILES powermanager.h networkmanager.h networkinterface.h network.h 
wirelessnetwork.h
     authentication.h bluetoothmanager.h bluetoothinterface.h 
bluetoothremotedevice.h
-    bluetoothinputdevice.h singletondefs.h networking.h DESTINATION 
${INCLUDE_INSTALL_DIR}/solid/control)
+    bluetoothinputdevice.h singletondefs.h networking.h solid_control_export.h 
DESTINATION 
+${INCLUDE_INSTALL_DIR}/solid/control)
 
Index: kdebase/runtime/solid/control/solid/control/networking.h
===================================================================
--- kdebase/runtime/solid/control/solid/control/networking.h    (revisión: 
660385)
+++ kdebase/runtime/solid/control/solid/control/networking.h    (copia de 
trabajo)
@@ -23,7 +23,7 @@
 
 #include <QtCore/QObject>
 
-#include <solid/solid_export.h>
+#include <solid/control/solid_control_export.h>
 class QAbstractSocket;
 
 namespace Solid
Index: kdebase/runtime/solid/control/solid/control/network.h
===================================================================
--- kdebase/runtime/solid/control/solid/control/network.h       (revisión: 
660385)
+++ kdebase/runtime/solid/control/solid/control/network.h       (copia de 
trabajo)
@@ -25,7 +25,7 @@
 #include <QtCore/QStringList>
 #include <QtNetwork/QNetworkAddressEntry>
 
-#include <solid/solid_export.h>
+#include <solid/control/solid_control_export.h>
 
 namespace Solid
 {
Index: kdebase/runtime/solid/control/solid/control/bluetoothmanager.h
===================================================================
--- kdebase/runtime/solid/control/solid/control/bluetoothmanager.h      
(revisión: 660385)
+++ kdebase/runtime/solid/control/solid/control/bluetoothmanager.h      (copia 
de trabajo)
@@ -26,7 +26,7 @@
 #include <QtCore/QObject>
 
 #include <solid/control/singletondefs.h>
-#include <solid/solid_export.h>
+#include <solid/control/solid_control_export.h>
 
 #include <solid/control/bluetoothinterface.h>
 #include <solid/control/bluetoothinputdevice.h>
Index: kdebase/runtime/solid/control/solid/control/managerbase_p.h
===================================================================
--- kdebase/runtime/solid/control/solid/control/managerbase_p.h (revisión: 
660385)
+++ kdebase/runtime/solid/control/solid/control/managerbase_p.h (copia de 
trabajo)
@@ -23,7 +23,7 @@
 #include <QObject>
 #include <QString>
 
-#include "solid/solid_export.h"
+#include "solid/control/solid_control_export.h"
 
 namespace Solid
 {

_______________________________________________
Kde-hardware-devel mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-hardware-devel

Reply via email to