Use proper namespace for iostream classes

Use local header files and not the installed ones.

diff --git a/demos/doodle1.cpp b/demos/doodle1.cpp
index da00c69..f682e6b 100644 (file)
--- a/demos/doodle1.cpp
+++ b/demos/doodle1.cpp
@@ -5,7 +5,7 @@
 ***********************
 **      FILE NAME      : doodle1.cpp
 **      SYSTEM NAME    : AXE - Andromeda X-windows Encapsulation
-**      VERSION NUMBER : $Revision: 1.1 $
+**      VERSION NUMBER : $Revision: 1.2 $
 **
 **  DESCRIPTION      :  Doodle is an exmaple application to demonstrate
 **                      the functions in AXE as a tutorial.
@@ -25,14 +25,18 @@
 
 /*****************************
    $Log: doodle1.cpp,v $
-   Revision 1.1  2002-07-25 08:01:18  arjen
+   Revision 1.2  2002-11-04 07:44:45  arjen
+   Use proper namespace for iostream classes
+   Use local header files and not the installed ones.
+
+   Revision 1.1  2002/07/25 08:01:18  arjen
    First checkin, AXE release 0.2
 
 *****************************/
 
-static const char *RCSID = "$Id: doodle1.cpp,v 1.1 2002-07-25 08:01:18 arjen Exp $";
+static const char *RCSID = "$Id: doodle1.cpp,v 1.2 2002-11-04 07:44:45 arjen Exp $";
 
-#include <AXE/xappl.h>
+#include "xappl.h"
 
 class doodle: public xapplication
 {

diff --git a/demos/doodle2.cpp b/demos/doodle2.cpp
index 14460e7..f917a8c 100644 (file)
--- a/demos/doodle2.cpp
+++ b/demos/doodle2.cpp
@@ -5,7 +5,7 @@
 ***********************
 **      FILE NAME      : doodle2.cpp
 **      SYSTEM NAME    : AXE - Andromeda X-windows Encapsulation
-**      VERSION NUMBER : $Revision: 1.1 $
+**      VERSION NUMBER : $Revision: 1.2 $
 **
 **  DESCRIPTION      :  Doodle is an exmaple application to demonstrate
 **                      the functions in AXE as a tutorial.
@@ -24,14 +24,18 @@
 
 /*****************************
    $Log: doodle2.cpp,v $
-   Revision 1.1  2002-07-25 08:01:18  arjen
+   Revision 1.2  2002-11-04 07:44:45  arjen
+   Use proper namespace for iostream classes
+   Use local header files and not the installed ones.
+
+   Revision 1.1  2002/07/25 08:01:18  arjen
    First checkin, AXE release 0.2
 
 *****************************/
 
-static const char *RCSID = "$Id: doodle2.cpp,v 1.1 2002-07-25 08:01:18 arjen Exp $";
+static const char *RCSID = "$Id: doodle2.cpp,v 1.2 2002-11-04 07:44:45 arjen Exp $";
 
-#include <AXE/xappl.h>
+#include "xappl.h"
 
 class doodle_view : public window
 {

diff --git a/demos/doodle3.cpp b/demos/doodle3.cpp
index 8c176b1..9323538 100644 (file)
--- a/demos/doodle3.cpp
+++ b/demos/doodle3.cpp
@@ -5,7 +5,7 @@
 ***********************
 **      FILE NAME      : doodle2.cpp
 **      SYSTEM NAME    : AXE - Andromeda X-windows Encapsulation
-**      VERSION NUMBER : $Revision: 1.1 $
+**      VERSION NUMBER : $Revision: 1.2 $
 **
 **  DESCRIPTION      :  Doodle is an exmaple application to demonstrate
 **                      the functions in AXE as a tutorial.
@@ -24,14 +24,18 @@
 
 /*****************************
    $Log: doodle3.cpp,v $
-   Revision 1.1  2002-07-25 08:01:18  arjen
+   Revision 1.2  2002-11-04 07:44:45  arjen
+   Use proper namespace for iostream classes
+   Use local header files and not the installed ones.
+
+   Revision 1.1  2002/07/25 08:01:18  arjen
    First checkin, AXE release 0.2
 
 *****************************/
 
-static const char *RCSID = "$Id: doodle3.cpp,v 1.1 2002-07-25 08:01:18 arjen Exp $";
+static const char *RCSID = "$Id: doodle3.cpp,v 1.2 2002-11-04 07:44:45 arjen Exp $";
 
-#include <AXE/xappl.h>
+#include "xappl.h"
 
 class doodle_view : public window
 {

diff --git a/demos/metronome.cpp b/demos/metronome.cpp
index 690a50f..9f21682 100644 (file)
--- a/demos/metronome.cpp
+++ b/demos/metronome.cpp
@@ -1,6 +1,6 @@
 #include <pthread.h>
 #include <unistd.h>
-#include <AXE/button.h>
+#include "button.h"
 
 #define CMD_QUIT    1
 #define CMD_FASTER  2
@@ -86,7 +86,7 @@ int xapp::DoCommand(int code)
       {
          BPM += 10;
       }
-      cout << BPM << "beats per minute\n";
+      std::cout << BPM << "beats per minute\n";
       return 1;
 
    case CMD_SLOWER:
@@ -94,7 +94,7 @@ int xapp::DoCommand(int code)
       {
          BPM -= 10;
       }
-      cout << BPM << "beats per minute\n";
+      std::cout << BPM << "beats per minute\n";
       return 1;
 
    case CMD_QUIT: