ossp-pkg/as/as-gui/as_slot.cpp 1.81 -> 1.82
--- as_slot.cpp 2003/01/22 19:20:30 1.81
+++ as_slot.cpp 2003/01/22 23:57:01 1.82
@@ -36,11 +36,6 @@
#include <qmenudata.h>
//#include <qregexp.h>
-// RPC headers
-#include <easysoap/SOAP.h>
-#include <coss/CosNaming.h>
-#include "asdb.h" // CORBA stubs and skeletons
-
// User interface
#include "as_gui.h" // Main classes
#include "as_except.h" // Exception classes
@@ -48,6 +43,15 @@
#include "as_generic.h" // Generic classes
#include "as_uuid.h" // UUID classes
+// RPC headers
+#ifdef HAVE_ESOAP
+#include <easysoap/SOAP.h>
+#endif // HAVE_ESOAP
+#ifdef HAVE_MICO
+#include <coss/CosNaming.h>
+#include "asdb.h" // CORBA stubs and skeletons
+#endif // HAVE_MICO
+
// Icon pixel maps
#include "as_gfx/cwlogo.xpm" // static const char *s_kpcCwlogo_xpm[]
#include "as_gfx/ossplogo.xpm" // static const char *s_kpcOssplogo_xpm[]
@@ -117,7 +121,7 @@
QTableSelection Select; // Highlighted text
int nTotal = 0; // Total row select
int nCurrent = 0; // Current row
- auto_ptr<AS::Uuid> pGuid(new AS::Uuid); // For GUID production
+ std::auto_ptr<AS::Uuid> pGuid(new AS::Uuid); // For GUID production
// Decide how many rows to add
Select = m_pMaintable->selection(0);
@@ -1156,6 +1160,7 @@
//
void Titraqform::syncIiop(void)
{
+#ifdef HAVE_MICO
int nNada = 0; // Some false parameters
char **ppcNada = NULL; // to fake out the ORB
CORBA::ORB_var Orb; // The ORB
@@ -1236,6 +1241,7 @@
catch (...) {
qWarning("Caught unknown exception\n");
}
+#endif // HAVE_MICO
}
//
@@ -1243,6 +1249,7 @@
//
void Titraqform::syncSoap(void)
{
+#ifdef HAVE_ESOAP
USING_EASYSOAP_NAMESPACE
try {
@@ -1273,6 +1280,7 @@
catch (...) {
qDebug("Caught unknown exception\n");
}
+#endif // HAVE_ESOAP
}
//
|
|
