PERFORCE change 164690 for review

[Jonathan Anderson]

http://perforce.freebsd.org/chv.cgi?CH=164690

Change 164690 by jona at jona-trustedbsd-kentvm on 2009/06/18 23:03:08

	Add a Qt-based powerbox server for good measure

Affected files ...

.. //depot/projects/trustedbsd/capabilities/cap-support/kpowerboxserver/CMakeLists.txt#5 edit
.. //depot/projects/trustedbsd/capabilities/cap-support/kpowerboxserver/kpowerboxserver.cpp#4 edit
.. //depot/projects/trustedbsd/capabilities/cap-support/kpowerboxserver/kpowerboxserver.h#3 edit
.. //depot/projects/trustedbsd/capabilities/cap-support/kpowerboxserver/main.cpp#2 edit
.. //depot/projects/trustedbsd/capabilities/cap-support/kpowerboxserver/test.cpp#3 delete
.. //depot/projects/trustedbsd/capabilities/cap-support/powerboxtest/main.cpp#1 add
.. //depot/projects/trustedbsd/capabilities/cap-support/powerboxtest/powerbox.h#1 add
.. //depot/projects/trustedbsd/capabilities/cap-support/powerboxtest/powerboxtest.pro#1 add
.. //depot/projects/trustedbsd/capabilities/cap-support/qpowerboxserver/main.cpp#1 add
.. //depot/projects/trustedbsd/capabilities/cap-support/qpowerboxserver/powerbox.h#1 add
.. //depot/projects/trustedbsd/capabilities/cap-support/qpowerboxserver/qpowerboxserver.cpp#1 add
.. //depot/projects/trustedbsd/capabilities/cap-support/qpowerboxserver/qpowerboxserver.h#1 add
.. //depot/projects/trustedbsd/capabilities/cap-support/qpowerboxserver/qpowerboxserver.pro#1 add

Differences ...

==== //depot/projects/trustedbsd/capabilities/cap-support/kpowerboxserver/CMakeLists.txt#5 (text+ko) ====

@@ -9,16 +9,7 @@
 include_directories(${KDE4_INCLUDES})
 
 set(server_SRC main.cpp kpowerboxserver.cpp)
-set(server_MOC_HDRS kpowerboxserver.h)
-#qt4_wrap_cpp(server_MOC_SRC ${server_MOC_HDRS})
-#KDE4_AUTOMOC(${server_SRC})
 
-
-set(test_SRC test.cpp)
-
-kde4_add_executable(test ${test_SRC})
-target_link_libraries(test ${QT_LIBRARIES} ${KDE4_KDEUI_LIBS})
-
-kde4_add_executable(kpowerboxserver ${server_SRC})# ${server_MOC_SRC})
+kde4_add_executable(kpowerboxserver ${server_SRC})
 target_link_libraries(kpowerboxserver ${QT_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS})
 

==== //depot/projects/trustedbsd/capabilities/cap-support/kpowerboxserver/kpowerboxserver.cpp#4 (text+ko) ====

@@ -15,7 +15,7 @@
 
 
 QStringList
-KPowerBoxServer::showKDEPowerbox(int operation, QString title, QString parent,
+KPowerBoxServer::showPowerbox(int operation, QString title, QString parent,
                 QString startDir, QString filter, bool allowMultipleSelections)
 {
 	std::cout << "Parent window: " << parent.toStdString() << std::endl;

==== //depot/projects/trustedbsd/capabilities/cap-support/kpowerboxserver/kpowerboxserver.h#3 (text+ko) ====

@@ -39,7 +39,7 @@
 	 *
 	 * @return  a list of file names
 	 */
-	Q_SCRIPTABLE QStringList showKDEPowerbox(
+	Q_SCRIPTABLE QStringList showPowerbox(
 		int operation,
 		QString title,
 		QString parent,

==== //depot/projects/trustedbsd/capabilities/cap-support/kpowerboxserver/main.cpp#2 (text+ko) ====

@@ -31,14 +31,13 @@
 	KCmdLineOptions cmdLineOptions;
 	cmdLineOptions.add("name <service-name>",
 	                   ki18n("Name of the service"),
-	                   "org.freebsd.capsicum.kpowerboxserver");
+	                   "org.freebsd.capsicum.kde");
 
 	KCmdLineArgs::addCmdLineOptions(cmdLineOptions);
 
 
 	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 	QString serviceName = args->getOption("name");
-	cout << "Service name: " << serviceName.toStdString() << endl;
 
 
 	KApplication app;
@@ -51,7 +50,7 @@
 
 	QDBusConnection dbus = QDBusConnection::sessionBus();
 	if(dbus.registerService(serviceName))
-		cout << "Registered service " << serviceName.toStdString() << endl;
+		cout << "Registered " << serviceName.toStdString();
 
 	else
 	{
@@ -60,9 +59,9 @@
 	}
 
 	KPowerBoxServer kpbserv;
-	QString path = "/KPowerboxServer";
+	QString path = "/PowerboxServer";
 	if(dbus.registerObject(path, &kpbserv, QDBusConnection::ExportAllSlots))
-		cout << "Registered " << path.toStdString() << endl;
+		cout << path.toStdString() << endl;
 
 	else
 	{