[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeprint
From:       Alex Merry <huntedhacker () tiscali ! co ! uk>
Date:       2007-07-04 19:49:22
Message-ID: 1183578562.854237.22356.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 683494 by alexmerry:

Some guards around #warning and ditch a FreeBSD-specific guard
around an include for <sys/wait.h>.



 M  +4 -0      cups/cupsdconf2/cups-util.c  
 M  +2 -0      cups/kpschedulepage.cpp  
 M  +2 -0      cups/kptagspage.cpp  
 M  +1 -4      kprinterimpl.cpp  


--- trunk/KDE/kdelibs/kdeprint/cups/cupsdconf2/cups-util.c #683493:683494
@@ -297,7 +297,9 @@
      /*
       * See if we can do authentication...
       */
+#ifdef __GNUC__
 #warning original code makes authentication for GET, typo?
+#endif
       if(cupsDoAuthentication(http, "PUT", resource))
         break;
 
@@ -336,7 +338,9 @@
 }
 #else /* CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR == 1 && CUPS_VERSION_PATCH < 20 */
 
+#ifdef __GNUC__
 #warning drop compat code if we drop support for CUPS v1.1.19
+#endif
 
 #endif /* CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR == 1 && CUPS_VERSION_PATCH < 20 */
 
--- trunk/KDE/kdelibs/kdeprint/cups/kpschedulepage.cpp #683493:683494
@@ -144,7 +144,9 @@
 	m_time->addItem(i18n("Specified Time"));
         m_time->setWhatsThis(whatsThisScheduledPrinting);
 	m_tedit = new QDateTimeEdit(this);
+#ifdef __GNUC__
 #warning "kde4: How to port m_tedit->setAutoAdvance ?"	
+#endif
 	//m_tedit->setAutoAdvance(true);
 	m_tedit->setTime(QTime::currentTime());
 	m_tedit->setEnabled(false);
--- trunk/KDE/kdelibs/kdeprint/cups/kptagspage.cpp #683493:683494
@@ -80,7 +80,9 @@
 	m_tags->horizontalHeader()->setResizeMode( QHeaderView::Stretch );
 	m_tags->setVerticalHeaderLabels(lst);
 
+#ifdef __GNUC__
 #warning "kde4: port m_tags->setReadOnly(ro);!!!!!\n";
+#endif
 	//m_tags->setReadOnly(ro);
 	m_tags->setWhatsThis(whatsThisAdditionalTagsTable);
 
--- trunk/KDE/kdelibs/kdeprint/kprinterimpl.cpp #683493:683494
@@ -46,11 +46,8 @@
 
 #include <stdlib.h>
 #include <unistd.h>
+#include <sys/wait.h>
 
-#ifdef Q_OS_FREEBSD
-# include <sys/wait.h>
-#endif
-
 #ifndef WEXITSTATUS
 #define WEXITSTATUS(status) (((status) & 0xff00) >> 8)
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]