[Nghost-commits] SF.net SVN: nghost:[2086] nghost2/branches/nghost2-qt/src/nscan/nscantest. cpp

[<ks...@us...>]

Revision: 2086
          http://nghost.svn.sourceforge.net/nghost/?rev=2086&view=rev
Author:   kshots
Date:     2010-04-25 18:48:11 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
* Stopped using the Qt event system (so test app exits when it's done)
* Used Qt logging messages (much more flexible on the user's end)

Modified Paths:
--------------
    nghost2/branches/nghost2-qt/src/nscan/nscantest.cpp

Modified: nghost2/branches/nghost2-qt/src/nscan/nscantest.cpp
===================================================================
--- nghost2/branches/nghost2-qt/src/nscan/nscantest.cpp	2010-04-25 18:37:22 UTC (rev 2085)
+++ nghost2/branches/nghost2-qt/src/nscan/nscantest.cpp	2010-04-25 18:48:11 UTC (rev 2086)
@@ -5,7 +5,6 @@
 #include "dbusinterface.h"
 
 using std::cout;
-using std::cerr;
 using std::endl;
 
 void usage(const char * pn);
@@ -68,16 +67,22 @@
 	}
 	if(paths.isEmpty())
 	{
-		 cerr << "Require at least one path" << endl;
+		 qFatal("Require at least one path");
 		 return 1;
 	}
 	if(extensions.isEmpty())
 	{
-		 cerr << "Require at least one extension" << endl;
+		 qFatal("Require at least one extension");
 	}
 	org::openice::nghost::nscan interface("org.openice.nghost", "/nscan", QDBusConnection::systemBus());
+	if(!interface.isValid())
+	{
+		 QDBusError error = interface.lastError();
+		 qFatal("Failed to setup the nscan interface connection: %s: %s", error.name().toAscii().constData(), error.message().toAscii().constData());
+		 return 1;
+	}
 	qDebug("Sending dbus message...");
 	interface.CreateScan(table, paths, extensions, dao);
-	qDebug("dbus message sent (I think)");
-	return a.exec();
+	qDebug("dbus message sent");
+	return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.