[Nghost-commits] SF.net SVN: nghost:[2073] nghost2/branches/nghost2-qt/src/nghost

[<nan...@us...>]

Revision: 2073
          http://nghost.svn.sourceforge.net/nghost/?rev=2073&view=rev
Author:   nanonymous
Date:     2010-03-04 17:31:41 +0000 (Thu, 04 Mar 2010)

Log Message:
-----------
fixed linker errors

Modified Paths:
--------------
    nghost2/branches/nghost2-qt/src/nghost/event.cpp
    nghost2/branches/nghost2-qt/src/nghost/event.h
    nghost2/branches/nghost2-qt/src/nghost/nscan.cpp

Modified: nghost2/branches/nghost2-qt/src/nghost/event.cpp
===================================================================
--- nghost2/branches/nghost2-qt/src/nghost/event.cpp	2010-03-04 17:30:59 UTC (rev 2072)
+++ nghost2/branches/nghost2-qt/src/nghost/event.cpp	2010-03-04 17:31:41 UTC (rev 2073)
@@ -220,7 +220,7 @@
 	if(ifButtonEvent()) return 1;
 	if(ifSliderEvent()) return 1;
 	if(ifListboxEvent()) return 1;
-	if(ifDesktopEvent()) return 1;
+//	if(ifDesktopEvent()) return 1;
 	nghost::inputClass::ifEventExit();
 	if(nghost::inputClass::ifEventEntry() || nghost::inputClass::ifEventVisible())
 	{
@@ -397,7 +397,7 @@
 	return 0;
 }
 
-int EventClass::ifDesktopEvent()
+/*int EventClass::ifDesktopEvent()
 {
 	for(size_t i=0;i<screen->desktops.size();i++)
 	{
@@ -415,7 +415,7 @@
 	}
 	return 0;
 }
-
+*/
 int EventClass::doAction(nghost::ActionClass a)
 {
 	string action=a.name,action_type=a.action_class,action2=a.method;
@@ -711,12 +711,12 @@
 		screen->redraw();
 		notifyScreenSubscribers();
 	}
-	else if(action_type=="desktop")
+/*	else if(action_type=="desktop")
 	{
 		for(size_t i=0;i<screen->desktops.size();i++)
 			if(action==screen->desktops[i]->getName())
 				doDesktopAction(a,i);
-	}
+	}*/
 	else if(action_type=="popup")
 		///ACTION_CLASS: popup
 		///ACTION_TEMPLATE popup:nameofpopupTemplate numbuttons "OnOkay:action 'params'" "OnCancel:action..." "text line1" "text line2" etc...
@@ -1141,7 +1141,7 @@
 	return 0;
 }
 
-int EventClass::doDesktopAction(nghost::ActionClass a, size_t i)
+/*int EventClass::doDesktopAction(nghost::ActionClass a, size_t i)
 {
 	if(a.method == "load")
 		///ACTION_TEMPLATE: desktop:name load "category"
@@ -1180,7 +1180,7 @@
 		return -1;
 	}
 	return 1;
-}
+}*/
 
 int EventClass::doMediaAction(nghost::ActionClass a)
 {

Modified: nghost2/branches/nghost2-qt/src/nghost/event.h
===================================================================
--- nghost2/branches/nghost2-qt/src/nghost/event.h	2010-03-04 17:30:59 UTC (rev 2072)
+++ nghost2/branches/nghost2-qt/src/nghost/event.h	2010-03-04 17:31:41 UTC (rev 2073)
@@ -72,7 +72,7 @@
 		int ifButtonEvent();
 		int ifSliderEvent();
 		int ifListboxEvent();
-		int ifDesktopEvent();
+//		int ifDesktopEvent();
 		int doAction(nghost::ActionClass);
 		int doEventSubscriberAction(nghost::ActionClass);
 		int doScreenAction(nghost::ActionClass action);

Modified: nghost2/branches/nghost2-qt/src/nghost/nscan.cpp
===================================================================
--- nghost2/branches/nghost2-qt/src/nghost/nscan.cpp	2010-03-04 17:30:59 UTC (rev 2072)
+++ nghost2/branches/nghost2-qt/src/nghost/nscan.cpp	2010-03-04 17:31:41 UTC (rev 2073)
@@ -10,11 +10,25 @@
 
 }
 
+void NScanScan::itemFoundEvent(QString item)
+{
+Q_UNUSED(item)
+}
+void NScanScan::progress(int percent)
+{
+Q_UNUSED(percent)
+}
+
 NScan::NScan()
 {
 	m_ActionClass = "nscan";
 }
 
+NScan::~NScan()
+{
+
+}
+
 void NScan::onAction(nghost::ActionClass action)
 {
 	if(action.method == "scan")
@@ -30,3 +44,4 @@
 
 	}
 }
+


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