Changeset 6443

Timestamp:

07/10/08 02:59:50 (5 months ago)

Author:

flynd

Message:

Some fixes to make qt4-gui compile on OpenBSD.

• Include CheckLibraryExists? module for cmake
• Find path for boost headers as they are needed for Licq includes
• Added some missing includes (unistd.h)
• Cast time_t to unsigned long in sprintf to remove warnings

Location:

trunk/qt4-gui

Files:

• CMakeLists.txt (modified) (2 diffs)
• src/core/signalmanager.cpp (modified) (1 diff)
• src/dialogs/chatdlg.cpp (modified) (1 diff)
• src/dialogs/filedlg.cpp (modified) (2 diffs)

trunk/qt4-gui/CMakeLists.txt

@@ -3 +3 @@
 include(CheckIncludeFile)
 include(TestCXXAcceptsFlag)
+include(CheckLibraryExists)
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
@@ -118 +119 @@
 endif (GPGME_FOUND)
 
+# Check for boost, used in Licq includes so we must have it
+find_package(Boost 1.31.1 COMPONENTS smart_ptr)
+link_directories ( ${Boost_LIBRARY_DIRS} )
+include_directories ( ${Boost_INCLUDE_DIRS} )
+set(LIBRARIES ${LIBRARIES} ${Boost_LIBRARIES})
 
 # Licq headers (see cmake --help-command find_path

trunk/qt4-gui/src/core/signalmanager.cpp

@@ -21 +21 @@
 #include "signalmanager.h"
 
+#include <unistd.h>
+
 #include <QApplication>
 #include <QSocketNotifier>

trunk/qt4-gui/src/dialogs/chatdlg.cpp

@@ -27 +27 @@
 #include "config.h"
 
-#include <ctype.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cstdlib>
+#include <unistd.h>
 
 #include <QActionGroup>

trunk/qt4-gui/src/dialogs/filedlg.cpp

@@ -214 +214 @@
   time_t nTime = time(NULL) - ftman->StartTime();
   unsigned long nBytesTransfered = ftman->BytesTransfered();
-  sprintf(sz, "%02ld:%02ld:%02ld", nTime / 3600, (nTime % 3600) / 60, (nTime % 60));
+  sprintf(sz, "%02lu:%02lu:%02lu", (unsigned long)(nTime / 3600), (unsigned long)((nTime % 3600) / 60), (unsigned long)((nTime % 60)));
   nfoTime->setText(sz);
   if (nTime == 0 || nBytesTransfered == 0)
@@ -229 +229 @@
   int nBytesLeft = ftman->FileSize() - ftman->FilePos();
   time_t nETA = (time_t)(nBytesLeft / (nBytesTransfered / nTime));
-  sprintf(sz, "%02ld:%02ld:%02ld", nETA / 3600, (nETA % 3600) / 60, (nETA % 60));
+  sprintf(sz, "%02lu:%02lu:%02lu", (unsigned long)(nETA / 3600), (unsigned long)((nETA % 3600) / 60), (unsigned long)((nETA % 60)));
   nfoETA->setText(sz);