-Use the global directory for .obj and .moc

-Include the foo.moc to work better

The problem just came up yesterday

4 files changed, 1 insertions, 7 deletions

diff --git a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp
index 6712870..2ee4a65 100644
--- a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp
+++ b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp
@@ -1,33 +1,32 @@
 #include <opie2/oapplication.h>
 #include <opie2/oconfig.h>
 #include <qpe/config.h>
 
 using namespace Opie::Core;
 
 int main( int argc, char** argv )
 {
     OApplication* app = new OApplication( argc, argv, "MyConfigDemoApplication" );
 
     OConfigGroupSaver c1( app->config(), "MyGroup" );
     app->config()->writeEntry( "AnEntry", "InMyGroup" );
     {
         OConfigGroupSaver c2( c1.config(), "AnotherGroup" );
         app->config()->writeEntry( "AnEntry", "InAnotherGroup" );
     }   // closing the scope returns to the last group
 
     app->config()->writeEntry( "AnotherEntry", "InMyGroup" );
 
     // do more stuff ...
 
     // in this (special) case it is necessary to manually call OConfig::write() (see below)
     app->config()->write();
 
     // can't delete the app when using the OConfigGroupSaver on top level scope,
     // because the destructor of the OConfigGroupSaver needs an application object
     //delete app; // destructor deletes config which writes changes back to disk
 
     return 0;
 
 }
 
-//#include "moc/oconfigdemo.moc"
diff --git a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro
index 9721e99..b29c106 100644
--- a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro
+++ b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro
@@ -1,20 +1,18 @@
 TEMPLATE        = app
 CONFIG          = qt warn_on 
 HEADERS         =
 SOURCES         = oconfigdemo.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lopiecore2
 TARGET          = oconfigdemo
-MOC_DIR     = moc
-OBJECTS_DIR = obj
 
 !contains( platform, x11 ) {
   include( $(OPIEDIR)/include.pro )
 }
 
 contains( platform, x11 ) {
   LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
 }
 
diff --git a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
index c0369ef..b046d28 100644
--- a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
+++ b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
@@ -14,129 +14,129 @@
 
 #include <opie2/odebug.h>
 #include <opie2/oapplication.h>
 #include <opie2/oglobal.h>
 #include <opie2/oglobalsettings.h>
 
 using namespace Opie::Core;
 
 class DemoApp : public OApplication
 {
 Q_OBJECT
 public:
   DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2 debug demo" )
   {
     // you have access to your OApplication object via oApp
     odebug << "Process-wide OApplication object @ " << oApp << "" << oendl; 
 
     // you have access to global settings via OGlobalSettings
     int mode = OGlobalSettings::debugMode();
 
     QVBox* vbox = new QVBox();
     setMainWidget( vbox );
 
     g = new QVButtonGroup( "Output Strategy", vbox );
     QRadioButton* r0 = new QRadioButton( "file", g );
     QRadioButton* r1 = new QRadioButton( "messagebox", g );
     QRadioButton* r2 = new QRadioButton( "stderr", g );
     QRadioButton* r3 = new QRadioButton( "syslog", g );
     QRadioButton* r4 = new QRadioButton( "socket", g );
     g->insert( r0, 0 );
     g->insert( r1, 1 );
     g->insert( r2, 2 );
     g->insert( r3, 3 );
     g->insert( r4, 4 );
     g->setRadioButtonExclusive( true );
     connect( g, SIGNAL( clicked(int) ), this, SLOT( chooseMethod(int) ) );
 
     if ( mode != -1 ) g->setButton( mode );
 
     QHButtonGroup* hbox = new QHButtonGroup( "Extra Output Information", vbox );
     e = new QLineEdit( hbox );
     QPushButton* pb = new QPushButton( hbox );
 
     connect( e, SIGNAL( returnPressed() ), this, SLOT( updateDebugOutput() ) );
     connect( pb, SIGNAL( clicked() ), this, SLOT( updateDebugOutput() ) );
 
     // show the additional debug mode dependent output information
     e->setText( OGlobalSettings::debugOutput() );
 
     // buttos
     QPushButton* info = new QPushButton( "Emit Debug(Info) Output!", vbox );
     connect( info, SIGNAL( clicked() ), this, SLOT( emitInfoOutput() ) );
     QPushButton* warn = new QPushButton( "Emit a Warning Output!", vbox );
     connect( warn, SIGNAL( clicked() ), this, SLOT( emitWarningOutput() ) );
     QPushButton* error = new QPushButton( "Emit an Error Output!", vbox );
     connect( error, SIGNAL( clicked() ), this, SLOT( emitErrorOutput() ) );
     QPushButton* fatal = new QPushButton( "Emit a Fatal Output!", vbox );
     connect( fatal, SIGNAL( clicked() ), this, SLOT( emitFatalOutput() ) );
 
     QPushButton* tb = new QPushButton( "Emit a Fatal Backtrace!", vbox );
     connect( tb, SIGNAL( clicked() ), this, SLOT( emitTBOutput() ) );
 
     info->show();
     warn->show();
     error->show();
     fatal->show();
     tb->show();
     g->show();
     hbox->show();
     e->show();
     vbox->show();
     showMainWidget( vbox );
   }
 
 public slots:
   void chooseMethod(int method)
   {
     m = method;
     odebug << "choosing method: " << method << "" << oendl; 
     OConfig* g = OGlobal::config();
     g->setGroup( "General" );
     g->writeEntry( "debugMode", m );
     e->setText( OGlobalSettings::debugOutput() );
     g->write();
   }
   void updateDebugOutput()
   {
     OConfig* g = OGlobal::config();
     g->setGroup( "General" );
     g->writeEntry( "debugOutput"+QString::number(OGlobalSettings::debugMode()), e->text() );
     g->write();
   }
   void emitInfoOutput()
   {
     odebug << "This is a debug message" << oendl;
   }
   void emitWarningOutput()
   {
     owarn << "This is a warning message" << oendl;
   }
   void emitErrorOutput()
   {
     oerr << "This is an errror message" << oendl;
   }
   void emitFatalOutput()
   {
     ofatal << "This is a fatal message" << oendl;
   }
   void emitTBOutput()
   {
     ofatal << "This is a fatal message + backtrace\n" + odBacktrace(); // odBacktrace includes \n
   }
 
 private:
   QButtonGroup* g;
   int m;
   QLineEdit* e;
 };
 
 int main( int argc, char** argv )
 {
     DemoApp* app = new DemoApp( argc, argv );
     app->exec();
 
     return 0;
 
 }
 
-#include "moc/odebugdemo.moc"
+#include "odebugdemo.moc"
diff --git a/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro b/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro
index 781d678..e06053c 100644
--- a/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro
+++ b/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro
@@ -1,20 +1,17 @@
 TEMPLATE        = app
 CONFIG          = qt warn_on 
 HEADERS         =
 SOURCES         = odebugdemo.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lopiecore2
 TARGET          = odebugdemo
 
-OBJECTS_DIR = obj
-
 !contains( platform, x11 ) {
   include( $(OPIEDIR)/include.pro )
 }
 
 contains( platform, x11 ) {
   LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
 }
 
-MOC_DIR = moc