[Piklab-svn] SF.net SVN: piklab:[2917] trunk/piklab_kde4

[<az...@us...>]

Revision: 2917
          http://piklab.svn.sourceforge.net/piklab/?rev=2917&view=rev
Author:   azhyd
Date:     2012-06-24 18:48:55 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
fix command-line utilities compilation on Windows

Modified Paths:
--------------
    trunk/piklab_kde4/Changelog
    trunk/piklab_kde4/piklab.kdev4
    trunk/piklab_kde4/src/common/port/usb_port.cpp

Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog	2012-06-12 04:48:11 UTC (rev 2916)
+++ trunk/piklab_kde4/Changelog	2012-06-24 18:48:55 UTC (rev 2917)
@@ -1,5 +1,6 @@
-0.16.1 (9 June 2012)
-* compile command-line utilities with Qt only
+0.16.1 (11 June 2012)
+* fix command-line utilities compilation with Qt only
+* fix command-line utilities compilation on Windows
 * remove icd3 since it is far from ready
 
 0.16.0 (3 June 2012)

Modified: trunk/piklab_kde4/piklab.kdev4
===================================================================
--- trunk/piklab_kde4/piklab.kdev4	2012-06-12 04:48:11 UTC (rev 2916)
+++ trunk/piklab_kde4/piklab.kdev4	2012-06-24 18:48:55 UTC (rev 2917)
@@ -1,3 +1,3 @@
 [Project]
 Manager=KDevCMakeManager
-Name=piklab_qt4
+Name=piklab_kde4

Modified: trunk/piklab_kde4/src/common/port/usb_port.cpp
===================================================================
--- trunk/piklab_kde4/src/common/port/usb_port.cpp	2012-06-12 04:48:11 UTC (rev 2916)
+++ trunk/piklab_kde4/src/common/port/usb_port.cpp	2012-06-24 18:48:55 UTC (rev 2917)
@@ -73,7 +73,7 @@
 {
   initialize();
 #ifdef HAVE_USB
-  int configuration = -1, interface = -1, altsetting = -1, bulk_endpoint = -1;
+  int bulk_endpoint = -1;
   // walk through the possible configs, etc.
   qDebug("This device has %d possible configuration(s).", dev->descriptor.bNumConfigurations);
   for (int c=0; c<dev->descriptor.bNumConfigurations; c++) {
@@ -91,9 +91,6 @@
           case 1: s += "(Isochronous) "; break;
           case 2: s += "(Bulk) ";
             /* Found the correct configuration, interface etc... it has bulk endpoints! */
-            configuration=c;
-            interface=i;
-            altsetting=a;
             break;
           case 3: s += "(Interrupt) "; break;
           default: s += "ERROR! Got an illegal value in endpoint bmAttributes";

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