Remove some unused includes/macros; fix build (re. QPointer)

diff --git a/qt/Application.cc b/qt/Application.cc
index f9395b20fcbfafc8d9a366f8e4802c8b1c8f01fa..a2a90cb27892dc86dcba24bf8fa52eb6b3a54764 100644 (file)
--- a/qt/Application.cc
+++ b/qt/Application.cc
@@ -7,7 +7,6 @@
  * $Id$
  */
 
-#include <cassert>
 #include <ctime>
 #include <iostream>
 

diff --git a/qt/Formatter.cc b/qt/Formatter.cc
index df51631158476924157538f3e9d200dd38c64270..ada908157656d0ecc9d753d43c21d016c71e8a87 100644 (file)
--- a/qt/Formatter.cc
+++ b/qt/Formatter.cc
@@ -7,8 +7,6 @@
  * $Id$
  */
 
-#include <iostream>
-
 #include <libtransmission/transmission.h>
 #include <libtransmission/utils.h> // tr_formatter
 

diff --git a/qt/MainWindow.cc b/qt/MainWindow.cc
index eff80c068a5d5cd620ea013a18fd9e8ec219a232..945f3ac8de55268d8065626407b9e5cd88216db9 100644 (file)
--- a/qt/MainWindow.cc
+++ b/qt/MainWindow.cc
@@ -8,7 +8,6 @@
  */
 
 #include <cassert>
-#include <iostream>
 
 #include <QtGui>
 #include <QCheckBox>
@@ -44,8 +43,6 @@
 #include "TorrentModel.h"
 #include "Utils.h"
 
-#define PREFS_KEY "prefs-key";
-
 
 /**
  * This is a proxy-style for that forces it to be always disabled.
@@ -337,8 +334,6 @@ MainWindow::onSetPrefs (bool isChecked)
     onSetPrefs ();
 }
 
-#define SHOW_KEY "show-mode"
-
 void
 MainWindow::initStatusBar ()
 {

diff --git a/qt/Prefs.cc b/qt/Prefs.cc
index 1b4ab409381cb136d0caa9b7e3e3d3feb617407a..692515b1a742503f5b746e50dfaed02bf6ee2fed 100644 (file)
--- a/qt/Prefs.cc
+++ b/qt/Prefs.cc
@@ -9,7 +9,6 @@
 
 #include <cassert>
 #include <cstdlib>
-#include <iostream>
 
 #include <QDateTime>
 #include <QDir>

diff --git a/qt/PrefsDialog.cc b/qt/PrefsDialog.cc
index 68b42bec001ba0e5728bc73d672ca54f97146933..7d331980c23aab335cbc0bc00f73ff704927dee2 100644 (file)
--- a/qt/PrefsDialog.cc
+++ b/qt/PrefsDialog.cc
@@ -7,9 +7,13 @@
  * $Id$
  */
 
+#ifdef _WIN32
+ #include <winsock2.h> // FD_SETSIZE
+#else
+ #include <sys/select.h> // FD_SETSIZE
+#endif
+
 #include <cassert>
-#include <climits> /* INT_MAX */
-#include <iostream>
 
 #include <QCheckBox>
 #include <QComboBox>

diff --git a/qt/TorrentDelegate.cc b/qt/TorrentDelegate.cc
index 5b8ff8e6d0dc56dcaa90ce8c2dcd60212ca2144c..dfc3d08bdadfa42f0d06d8ccfa4b127b98e38912 100644 (file)
--- a/qt/TorrentDelegate.cc
+++ b/qt/TorrentDelegate.cc
@@ -7,9 +7,6 @@
  * $Id$
  */
 
-
-#include <iostream>
-
 #include <QApplication>
 #include <QFont>
 #include <QFontMetrics>

diff --git a/qt/TorrentDelegateMin.cc b/qt/TorrentDelegateMin.cc
index b69ad79e03aeed34f0bed858a6c6391c96b463e8..361a9904926fe05b1e5922fc4b0a3be062700e1f 100644 (file)
--- a/qt/TorrentDelegateMin.cc
+++ b/qt/TorrentDelegateMin.cc
@@ -7,8 +7,6 @@
  * $Id$
  */
 
-#include <iostream>
-
 #include <QApplication>
 #include <QBrush>
 #include <QFont>

diff --git a/qt/TorrentFilter.cc b/qt/TorrentFilter.cc
index 019b3e376a75e1c7fe041f5b9550b7234432bc4b..5042b12d2ac43962dfd9145872de17257e4f33b2 100644 (file)
--- a/qt/TorrentFilter.cc
+++ b/qt/TorrentFilter.cc
@@ -8,7 +8,6 @@
  */
 
 #include <algorithm>
-#include <iostream>
 
 #include "Filters.h"
 #include "Prefs.h"

diff --git a/qt/TorrentModel.cc b/qt/TorrentModel.cc
index 197a0ad895f2880e1a6c67c44e67c4df06a3fb55..5f6509a03f11972f551715426e249644ef9a00b9 100644 (file)
--- a/qt/TorrentModel.cc
+++ b/qt/TorrentModel.cc
@@ -7,7 +7,6 @@
  * $Id$
  */
 
-#include <cassert>
 #include <iostream>
 
 #include <libtransmission/transmission.h>

diff --git a/qt/TrackerDelegate.cc b/qt/TrackerDelegate.cc
index ee23c83ad1f1c1246059d942132104db01382f4a..23018734e1541ea42ebe0e0e8970734c3ac33d37 100644 (file)
--- a/qt/TrackerDelegate.cc
+++ b/qt/TrackerDelegate.cc
@@ -7,8 +7,6 @@
  * $Id$
  */
 
-#include <iostream>
-
 #include <QAbstractTextDocumentLayout>
 #include <QApplication>
 #include <QPainter>

diff --git a/qt/Utils.h b/qt/Utils.h
index eaac3d25d350736bb551fe65711266a09f4d65c5..2d7f281bf826989ba30f933f91bcf7647e0db661 100644 (file)
--- a/qt/Utils.h
+++ b/qt/Utils.h
@@ -12,6 +12,7 @@
 
 #include <cctype> // isxdigit()
 
+#include <QPointer>
 #include <QRect>
 #include <QString>