ChangeLogTag: Mon Dec 6 00:39:19 2004 Marek Brudka <mbrudka@aster.pl>

26 files changed, 100 insertions, 74 deletions

diff --git a/ChangeLog b/ChangeLog
index 9e85faf16a8..569830eb063 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+Sun Dec  5 23:18:29 2004  Marek Brudka  <mbrudka@aster.pl>
+
+	* include/makeinclude/wrapper_macros.GNU (Module):
+	* include/makeinclude/platform_linux_pgi.GNU (Module):
+	* include/makeinclude/platform_linux_icc.GNU (Module):
+	* include/makeinclude/platform_linux.GNU (Module):
+	Removed unnecessary ACE_HAS_QT and make options regarding qt. All those things
+	are now set up by MPC.
+	* tests/tests.mpc (Module):
+	Removed explicit dependency on qt. It is ensured now by qt base project.
+	* tests/QtReactor_Test.h (Module):
+	* tests/QtReactor_Test.cpp (Module):
+	Removed ACE_HAS_QT section as MPC manages now configuration.
+	* bin/MakeProjectCreator/config/tao_qtreactor.mpb (Module):
+	Removed tao_qtreactor as it seems to be redundant with qt=1. I'm not sure if this.
+	* bin/MakeProjectCreator/config/ace_qt.mpb (Module):
+	Removed ace_qtreactor as it seems to be redundant with qt=1. I'm not sure if this.
+	* ace/config-win32-msvc.h (Module):
+	Removed sections related with ACE_HAS_QT and QT_DLL definition. It is manged now by MPC.
+	* ace/config-doxygen.h (Module):
+	Removed ACE_HAS_QT as it is ACE_QtReactor compiles now alway if qt option is set.
+	* ace/README (Module):
+	Removed paragraph on ACE_HAS_QT.
+	* ace/QtReactor.h (Module):
+	* ace/QtReactor.cpp (Module):
+	Removed code compiled conditionally on ACE_HAS_QT predicate. Compilation is now managed by MPC.
+
 Sat Dec  4 17:03:38 2004  Marek Brudka  <mbrudka@aster.pl>
 
 	* tests/RMCast/.cvsignore (Module):
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 75524d89135..efd79a770e1 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,29 +1,32 @@
-Sat Dec  4 15:49:38 2004  Marek Brudka  <mbrudka@aster.pl>
+Mon Dec  6 00:39:19 2004  Marek Brudka  <mbrudka@aster.pl>
+
+	* examples/OEP/Display/NavDisplayGUI_exec/README (Module):
+	Remove reference to ACE_HAS_QT.
 
 	* examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc (Module):
 	Removed deprecated qt_moc base project.
 
 Tue Nov 30 21:41:58 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* CIDLC/ServantSourceGenerator.cpp (namespace): 
+	* CIDLC/ServantSourceGenerator.cpp (namespace):
 
 	  More use of ACE_NEW_THROW_EX instead of ACE_NEW_RETURN.
 
 Tue Nov 30 21:03:00 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* CIDLC/ServantSourceGenerator.cpp (namespace): 
+	* CIDLC/ServantSourceGenerator.cpp (namespace):
 
 	  Another use of ACE_NEW_THROW_EX instead of ACE_NEW_RETURN.
 
 Tue Nov 30 20:39:26 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* CIDLC/ServantSourceGenerator.cpp (namespace): 
+	* CIDLC/ServantSourceGenerator.cpp (namespace):
 
 	  Used ACE_NEW_THROW_EX instead of ACE_NEW_RETURN.
 
 Tue Nov 30 20:22:19 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* CIDLC/ServantSourceGenerator.cpp (namespace): 
+	* CIDLC/ServantSourceGenerator.cpp (namespace):
 
 	  Fixes for VC6.
 
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/README b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/README
index 83b58e12736..c5cb76a6fd9 100644
--- a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/README
+++ b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/README
@@ -1,7 +1,7 @@
 This example is the Qt-based GUI implementation of NavDisplay component.
 
 It is NOT necessary to compile ACE/TAO/CIAO with Qt support,
-i.e. ACE_HAS_QT since this example does not relyes on Qt Reactor and
+since this example does not relyes on Qt Reactor and
 communicates with GUI part using QApplication::postMessage() and
 simple Command Pattern based framework.  But be sure that QTDIR
 environment variable is pointed to your Qt installation directory.
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b2dddbfc203..aacb2cef956 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,22 @@
+Mon Dec  6 00:35:59 2004  Marek Brudka  <mbrudka@aster.pl>
+
+	* TAO_IDL/.cvsignore (Module):
+	To remove cvs warnings.
+
+Sun Dec  5 23:17:46 2004  Marek Brudka  <mbrudka@aster.pl>
+
+	* tests/QtTests/test_i.h (Module):
+	* tests/QtTests/test_i.cpp (Module):
+	* tests/QtTests/server.cpp (Module):
+	* tests/QtTests/server.cpp (Module):
+	* tests/QtTests/client.h (Module):
+	* tests/QtTests/client.cpp (Module):
+	* tao/qt_resource.h (Module):
+	* tao/qt_resource.cpp (Module):
+	Removed dependencies on ACE_HAS_QT. Compilation is now managed by MPC.
+	* tests/QtTests/QtTests.mpc (Module):
+	Removed explicite dependencies on qt. They are managed now by qt based projects.
+
 Fri Dec  3 23:15:18 2004  Marek Brudka  <mbrudka@aster.pl>
 
 	* tao/tao_xtreactor.mpc (Added):
diff --git a/TAO/TAO_IDL/.cvsignore b/TAO/TAO_IDL/.cvsignore
new file mode 100644
index 00000000000..65c93c3e85c
--- /dev/null
+++ b/TAO/TAO_IDL/.cvsignore
@@ -0,0 +1 @@
+tao_idl
diff --git a/TAO/tao/qt_resource.cpp b/TAO/tao/qt_resource.cpp
index 5207f41c981..b32eaab6389 100644
--- a/TAO/tao/qt_resource.cpp
+++ b/TAO/tao/qt_resource.cpp
@@ -1,8 +1,6 @@
 //$Id$
 #include "tao/qt_resource.h"
 
-#if defined (ACE_HAS_QT)
-
 #if !defined (__ACE_INLINE__)
 # include "qt_resource.i"
 #endif /* ! __ACE_INLINE__ */
@@ -12,18 +10,18 @@ QApplication *TAO_QtResource_Factory::qapp_ = 0 ;
 ACE_Reactor_Impl *
 TAO_QtResource_Factory::allocate_reactor_impl (void) const
 {
-  if (this->qapp_ == 0) 
+  if (this->qapp_ == 0)
     return 0;
 
-  ACE_Reactor_Impl *impl = 0; 
+  ACE_Reactor_Impl *impl = 0;
 
-  ACE_NEW_RETURN(impl, 
-                 ACE_QtReactor (qapp_), 
+  ACE_NEW_RETURN(impl,
+                 ACE_QtReactor (qapp_),
                  0);
   return impl;
 }
 
-void 
+void
 TAO_QtResource_Factory::set_context (QApplication *qapp)
 {
   TAO_QtResource_Factory::qapp_ = qapp;
@@ -38,4 +36,3 @@ ACE_STATIC_SVC_DEFINE (TAO_QtResource_Factory,
 
 ACE_FACTORY_DEFINE (TAO, TAO_QtResource_Factory)
 
-#endif /* ACE_HAS_QT */
diff --git a/TAO/tao/qt_resource.h b/TAO/tao/qt_resource.h
index 6e7a84c5b15..2892db18fc7 100644
--- a/TAO/tao/qt_resource.h
+++ b/TAO/tao/qt_resource.h
@@ -20,7 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_HAS_QT)
 #include "ace/QtReactor.h"
 
 
@@ -58,6 +57,5 @@ private:
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_QtResource_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_QtResource_Factory)
 
-#endif /*ACE_HAS_QT */
 #include /**/ "ace/post.h"
 #endif /* QTRESOURCE_H */
diff --git a/TAO/tests/QtTests/QtTests.mpc b/TAO/tests/QtTests/QtTests.mpc
index 7c80f73c23a..3ccfbc03243 100644
--- a/TAO/tests/QtTests/QtTests.mpc
+++ b/TAO/tests/QtTests/QtTests.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, tao_qtreactor {
-  requires += qt
+project(*server): taoexe, portableserver, tao_qtreactor  {
 
   MOC_Files {
     test_i.h
@@ -16,7 +15,6 @@ project(*server): taoexe, portableserver, tao_qtreactor {
 }
 
 project(*client): taoexe, tao_qtreactor {
-  requires += qt
 
   MOC_Files {
     client.h
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index fc505726700..263f52598ef 100755
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -5,8 +5,6 @@
 
 ACE_RCSID(QtTests, client, "$Id$")
 
-#if !defined (ACE_HAS_QT)
-
 int
 main (int, char *[])
 {
@@ -167,4 +165,3 @@ Client::shutdown_call (void)
   this->server_->shutdown ();
 }
 
-#endif /* ACE_HAS_QT*/
diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h
index 36da68ab1f9..d70cc8f58c6 100755
--- a/TAO/tests/QtTests/client.h
+++ b/TAO/tests/QtTests/client.h
@@ -18,8 +18,6 @@
 
 #include "testC.h"
 
-#if defined (ACE_HAS_QT)
-
 #include "tao/qt_resource.h"
 #include <qapplication.h>
 #include <qvbox.h>
@@ -70,6 +68,4 @@ private:
   QApplication *qapp_;
 };
 
-#endif /*ACE_HAS_QT*/
-
 #endif /* _QT_CLIENT_H */
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 1103e4a3358..69f3495e56f 100755
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -5,8 +5,6 @@
 
 ACE_RCSID (QtTests, server, "$Id$")
 
-#if !defined (ACE_HAS_QT)
-
 int
 main (int, char *[])
 {
@@ -152,5 +150,3 @@ main (int argc, char *argv[])
   ACE_ENDTRY;
   return 0;
 }
-
-#endif /* ACE_HAS_QT */
diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp
index 8b5bae8c705..101cadf845d 100755
--- a/TAO/tests/QtTests/test_i.cpp
+++ b/TAO/tests/QtTests/test_i.cpp
@@ -2,8 +2,6 @@
 
 #include "test_i.h"
 
-#if defined(ACE_HAS_QT)
-
 #if !defined(__ACE_INLINE__)
 #include "test_i.i"
 #endif /* __ACE_INLINE__ */
@@ -35,4 +33,4 @@ LCD_Display_imp::send_val (CORBA::Long val
               "The value from server is <%d> \n", val));
   emit set_value (val);
 }
-#endif /* ACE_HAS_QT */
+
diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h
index 46eeb94d323..78247d9ace6 100755
--- a/TAO/tests/QtTests/test_i.h
+++ b/TAO/tests/QtTests/test_i.h
@@ -19,8 +19,6 @@
 #include "testS.h"
 
 
-#if defined(ACE_HAS_QT)
-
 #include "tao/qt_resource.h"
 #include <qapplication.h>
 #include <qobject.h>
@@ -60,6 +58,4 @@ private:
 #include "test_i.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* ACE_HAS_QT */
-
 #endif /* SERVER_TEST_I_H */
diff --git a/ace/QtReactor.cpp b/ace/QtReactor.cpp
index de638db08c9..ab82e9c9944 100644
--- a/ace/QtReactor.cpp
+++ b/ace/QtReactor.cpp
@@ -1,6 +1,5 @@
 //$Id$
 #include "ace/QtReactor.h"
-#if defined (ACE_HAS_QT)
 ACE_ALLOC_HOOK_DEFINE (ACE_QtReactor)
 
 // Must be called with lock held
@@ -637,4 +636,3 @@ template class ACE_Map_Reverse_Iterator<ACE_HANDLE, QSocketNotifier *, ACE_Null_
 #pragma instantiate ACE_Map_Iterator<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#endif /*ACE_HAS_QT */
diff --git a/ace/QtReactor.h b/ace/QtReactor.h
index 26e48e21bff..514b47e2352 100644
--- a/ace/QtReactor.h
+++ b/ace/QtReactor.h
@@ -22,7 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_HAS_QT)
 #include "ace/Map_Manager.h"
 
 // Qttoolkit specific includes.
@@ -212,7 +211,5 @@ void read_event (int FD);
     void timeout_event (void);
 };
 
-#endif /*ACE_HAS_QT */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_QTREACTOR_H */
diff --git a/ace/README b/ace/README
index 8294d9fb4fb..3585f1c6d5c 100644
--- a/ace/README
+++ b/ace/README
@@ -1655,18 +1655,6 @@ ACE_USES_GPROF:
     When using gprof mainly on Linux, #define ACE_USES_GPROF
     will add calls to getitimer/setitimer in order to initialize profile
     timer and overcome the problem of gprof with multithreaded applications.
-ACE_HAS_QT:
-----------------------------
-  Used in:
-    ace/QtReactor.cpp
-    ace/QtReactor.h
-    tests/QtReactor_Test.cpp
-    tests/QtReactor_Test.h
-    TAO/tao/qt_resource.h
-    TAO/tao/qt_resource.cpp
-    TAO/tests/QtTests/*
-  Notes:
-    Turns on integration with Qt.
 
 ACE_QTREACTOR_CLEAR_PENDING_EVENTS:
 ----------------------------
diff --git a/ace/config-doxygen.h b/ace/config-doxygen.h
index de23ed5b5cb..bd59a3f6ca0 100644
--- a/ace/config-doxygen.h
+++ b/ace/config-doxygen.h
@@ -63,7 +63,6 @@
 /// Several GUI Reactors that are only enabled in some platforms.
 #define ACE_HAS_XT
 #define ACE_HAS_FL
-#define ACE_HAS_QT
 #define ACE_HAS_TK
 #define ACE_HAS_GTK
 
diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h
index 02e0daa03a4..bb319cef13e 100644
--- a/ace/config-win32-msvc.h
+++ b/ace/config-win32-msvc.h
@@ -139,10 +139,5 @@
 #     endif /* !STRICT */
 #   endif /* ACE_HAS_STRICT */
 
-// Define QT_DLL for QtReactor to be compiled correct
-#   if defined (ACE_HAS_QT)
-#     define QT_DLL
-#   endif
-
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_WIN32_MSVC_H */
diff --git a/apps/gperf/ChangeLog b/apps/gperf/ChangeLog
index af7bb6444ce..062891724fe 100644
--- a/apps/gperf/ChangeLog
+++ b/apps/gperf/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-05  Marek Brudka  <mbrudka@aster.pl>
+
+	* tests/.cvsignore (Module):
+	* src/.cvsignore (Module):
+	Created some entries to prevent cvs warnings.
+
 Fri Aug  5 15:30:00 UTC 2004  Simon Massey  <simon.massey@prismtechnologies.com>
 
         * apps/gperf/tests/gperf_test.mpb
diff --git a/apps/gperf/src/.cvsignore b/apps/gperf/src/.cvsignore
new file mode 100644
index 00000000000..ed65273b603
--- /dev/null
+++ b/apps/gperf/src/.cvsignore
@@ -0,0 +1 @@
+gperf
diff --git a/apps/gperf/tests/.cvsignore b/apps/gperf/tests/.cvsignore
new file mode 100644
index 00000000000..70e6297c804
--- /dev/null
+++ b/apps/gperf/tests/.cvsignore
@@ -0,0 +1,29 @@
+ada.cpp
+adadefs.cpp
+aout
+aout.out
+c.cpp
+corba.cpp
+cout
+cout.out
+cpp.cpp
+cppout
+cppout.out
+idl.cpp
+iout
+iout.out
+iout2
+iout2.out
+m3out
+m3out.out
+modula3.cpp
+pascal.cpp
+pout
+pout.out
+preout
+preout.out
+tao.cpp
+taoout
+taoout.out
+tout
+tout.out
diff --git a/bin/MakeProjectCreator/config/ace_qt.mpb b/bin/MakeProjectCreator/config/ace_qt.mpb
index 2376c51e1e0..026c1ade31b 100644
--- a/bin/MakeProjectCreator/config/ace_qt.mpb
+++ b/bin/MakeProjectCreator/config/ace_qt.mpb
@@ -2,8 +2,6 @@
 // $Id$
 
 project: qt {
-  macros += ACE_HAS_QT
-
   // Depends on configration from include/makeinclude/platform_*.GNU
   verbatim(gnuace,local) {
     CPPFLAGS += $(PLATFORM_QT_CPPFLAGS)
diff --git a/bin/MakeProjectCreator/config/tao_qtreactor.mpb b/bin/MakeProjectCreator/config/tao_qtreactor.mpb
index 424b5301d32..359269d60ed 100644
--- a/bin/MakeProjectCreator/config/tao_qtreactor.mpb
+++ b/bin/MakeProjectCreator/config/tao_qtreactor.mpb
@@ -1,7 +1,6 @@
 // -*- MPC -*-
 
 project : taolib, ace_qtreactor {
-  requires += qt_reactor
   after    += TAO_QtReactor
   libs     += TAO_QtReactor
 }
diff --git a/tests/QtReactor_Test.cpp b/tests/QtReactor_Test.cpp
index 1502a8ff373..b41fd7ea24b 100644
--- a/tests/QtReactor_Test.cpp
+++ b/tests/QtReactor_Test.cpp
@@ -59,7 +59,6 @@ ACE_RCSID (tests,
 #include "ace/SOCK_Connector.h"
 #include "ace/SOCK_Dgram.h"
 
-#if defined (ACE_HAS_QT)
 // Qt specific code
 #include "QtReactor_Test.h"
 
@@ -86,7 +85,6 @@ void QTestApplication::exec( int msec )
 	inherited::exec();
 }
 
-#endif /* ACE_HAS_QT */
 
 // maximum time for testing QtReactor (msec)
 const int TotalTestTime = 8000;
@@ -892,7 +890,6 @@ void testNativeReactor( int argc, ACE_TCHAR *argv[] )
 
 void testQtReactor( int argc, ACE_TCHAR *argv[] )
 {
-#if defined (ACE_HAS_QT)
 	// Qt specific code
   ACE_DEBUG ((LM_INFO, ACE_TEXT( "Testing QtReactor\n")));
 
@@ -914,7 +911,6 @@ void testQtReactor( int argc, ACE_TCHAR *argv[] )
         else
             ACE_ERROR ((LM_INFO, ACE_TEXT( "QtReactor_Test passed.\n")));
     }
-#endif /* ACE_HAS_QT */
 }
 
 int
@@ -925,10 +921,8 @@ run_main ( int argc, ACE_TCHAR *argv[] )
 	testNativeReactor( argc, argv );
 	testQtReactor( argc, argv );
 
-#ifndef ACE_HAS_QT
 	ACE_ERROR ( (LM_INFO,
-				   ACE_TEXT( "ACE is not configured for Qt on this platform\n" ) ) );
-#endif /* ACE_HAS_QT */
+                     ACE_TEXT( "ACE is not configured for Qt on this platform\n" ) ) );
 
 	ACE_END_TEST;
 
diff --git a/tests/QtReactor_Test.h b/tests/QtReactor_Test.h
index e2ce413521e..f2be9a5331c 100644
--- a/tests/QtReactor_Test.h
+++ b/tests/QtReactor_Test.h
@@ -3,7 +3,6 @@
 #ifndef QTREACTOR_TEST_H
 #define QTREACTOR_TEST_H
 
-#ifdef ACE_HAS_QT
 #include <qapplication.h>
 #include <qtimer.h>
 
@@ -21,6 +20,4 @@ private:
 	QTimer finishTimer_; //!< timer to finish the test
 };
 
-#endif /*ACE_HAS_QT*/
-
 #endif /*QTREACTOR_TEST_H*/
diff --git a/tests/tests.mpc b/tests/tests.mpc
index 048e069a377..063e53d8259 100644
--- a/tests/tests.mpc
+++ b/tests/tests.mpc
@@ -1140,7 +1140,6 @@ project(SOCK_SEQPACK_SCTP_Test) : acetest {
 
 project(QtReactor Test) : acetest, ace_qtreactor {
   exename   = QtReactor_Test
-  requires += qt
   MOC_Files {
     QtReactor_Test.h
   }