Remove unused rfb/util.h includes

These files don't use anything from this header, so remove the include.

This exposes some missing includes in other places, though. So add an
explicit include in the files that were relying on an indirect
inclusion.

diff --git a/common/rfb/CMsgHandler.cxx b/common/rfb/CMsgHandler.cxx
index f547f0a9dbaee0f27763a2201cabdb94cbf1cc6b..e37811f99f55af14c515ffd2403037821af01d50 100644 (file)
--- a/common/rfb/CMsgHandler.cxx
+++ b/common/rfb/CMsgHandler.cxx
@@ -28,6 +28,7 @@
 #include <rfb/CMsgHandler.h>
 #include <rfb/clipboardTypes.h>
 #include <rfb/screenTypes.h>
+#include <rfb/util.h>
 
 static rfb::LogWriter vlog("CMsgHandler");
 

diff --git a/common/rfb/CMsgReader.cxx b/common/rfb/CMsgReader.cxx
index 0052d35e0ec653cb79b590e16b6b99f35e1171f0..be5133cfd6cadbefacc5619dda6a704c618cd0c2 100644 (file)
--- a/common/rfb/CMsgReader.cxx
+++ b/common/rfb/CMsgReader.cxx
@@ -31,6 +31,7 @@
 
 #include <rfb/msgTypes.h>
 #include <rfb/clipboardTypes.h>
+#include <rfb/util.h>
 #include <rfb/Exception.h>
 #include <rfb/LogWriter.h>
 #include <rfb/CMsgHandler.h>

diff --git a/common/rfb/CSecurityRSAAES.cxx b/common/rfb/CSecurityRSAAES.cxx
index bff088ad3f240bfb47b3a529309780cafdfe967d..6194caab1d4d10fc2fff1354027627e209a926ec 100644 (file)
--- a/common/rfb/CSecurityRSAAES.cxx
+++ b/common/rfb/CSecurityRSAAES.cxx
@@ -39,6 +39,7 @@
 #include <rfb/LogWriter.h>
 #include <rfb/Exception.h>
 #include <rfb/UserMsgBox.h>
+#include <rfb/util.h>
 #include <rdr/AESInStream.h>
 #include <rdr/AESOutStream.h>
 #include <os/os.h>

diff --git a/common/rfb/CSecurityTLS.cxx b/common/rfb/CSecurityTLS.cxx
index 58794e89819a241e3b407f667dd447387d5721b9..e24f9d71479b5df443a2b86ffcc1edd7dda22e56 100644 (file)
--- a/common/rfb/CSecurityTLS.cxx
+++ b/common/rfb/CSecurityTLS.cxx
@@ -39,6 +39,7 @@
 #include <rfb/LogWriter.h>
 #include <rfb/Exception.h>
 #include <rfb/UserMsgBox.h>
+#include <rfb/util.h>
 #include <rdr/TLSInStream.h>
 #include <rdr/TLSOutStream.h>
 #include <os/os.h>

diff --git a/common/rfb/CSecurityVncAuth.cxx b/common/rfb/CSecurityVncAuth.cxx
index 875e088a5db658c3ca0b4c5a59b937519e609617..f6a5e07a656ffb3927db2c0f05a6b195bee4e9a7 100644 (file)
--- a/common/rfb/CSecurityVncAuth.cxx
+++ b/common/rfb/CSecurityVncAuth.cxx
@@ -30,7 +30,6 @@
 
 #include <rfb/CConnection.h>
 #include <rfb/CSecurityVncAuth.h>
-#include <rfb/util.h>
 #include <rfb/Security.h>
 extern "C" {
 #include <rfb/d3des.h>

diff --git a/common/rfb/ComparingUpdateTracker.cxx b/common/rfb/ComparingUpdateTracker.cxx
index c8d69b78799a992db6bdf2adb384a4e8567e99d1..1bad487eda836f13fbebbb9b23196aeef82a23be 100644 (file)
--- a/common/rfb/ComparingUpdateTracker.cxx
+++ b/common/rfb/ComparingUpdateTracker.cxx
@@ -26,6 +26,8 @@
 
 #include <rfb/Exception.h>
 #include <rfb/LogWriter.h>
+#include <rfb/util.h>
+
 #include <rfb/ComparingUpdateTracker.h>
 
 using namespace rfb;

diff --git a/common/rfb/DecodeManager.cxx b/common/rfb/DecodeManager.cxx
index b6dd81f49ec7952c45e0abafd22811701d0427ae..e39a39433177d148440d705df96cc05500171af6 100644 (file)
--- a/common/rfb/DecodeManager.cxx
+++ b/common/rfb/DecodeManager.cxx
@@ -28,8 +28,8 @@
 #include <rfb/Decoder.h>
 #include <rfb/Exception.h>
 #include <rfb/Region.h>
-
 #include <rfb/LogWriter.h>
+#include <rfb/util.h>
 
 #include <rdr/Exception.h>
 #include <rdr/MemOutStream.h>

diff --git a/common/rfb/EncodeManager.cxx b/common/rfb/EncodeManager.cxx
index e2571cabef5ebf37c66a370c88d449d1f69e6bbe..cade150654866f2e3fe12b518d9533e2a82ab37f 100644 (file)
--- a/common/rfb/EncodeManager.cxx
+++ b/common/rfb/EncodeManager.cxx
@@ -33,6 +33,7 @@
 #include <rfb/UpdateTracker.h>
 #include <rfb/LogWriter.h>
 #include <rfb/Exception.h>
+#include <rfb/util.h>
 
 #include <rfb/RawEncoder.h>
 #include <rfb/RREEncoder.h>

diff --git a/common/rfb/InputHandler.h b/common/rfb/InputHandler.h
index fbb69a56bd9a76526ff4ea5f7f4f155d0f34aeb7..ad6c4be50aa3377f718365fc27c57e092400ea15 100644 (file)
--- a/common/rfb/InputHandler.h
+++ b/common/rfb/InputHandler.h
@@ -26,7 +26,6 @@
 #include <stdint.h>
 
 #include <rfb/Rect.h>
-#include <rfb/util.h>
 
 namespace rfb {
 

diff --git a/common/rfb/Logger.cxx b/common/rfb/Logger.cxx
index e815dad4e503d2fa89ffc41a60184ee2a962b4ee..7e0895e440c98598e453db321bc0a8be7361d6ac 100644 (file)
--- a/common/rfb/Logger.cxx
+++ b/common/rfb/Logger.cxx
@@ -28,7 +28,6 @@
 
 #include <rfb/Logger.h>
 #include <rfb/LogWriter.h>
-#include <rfb/util.h>
 
 using namespace rfb;
 

diff --git a/common/rfb/Logger_syslog.cxx b/common/rfb/Logger_syslog.cxx
index 0f5c842388f7fc48b1c810c38ce6cf52023aadc4..320ab4b0e9b268083fa094129d1cbf7cf35378e5 100644 (file)
--- a/common/rfb/Logger_syslog.cxx
+++ b/common/rfb/Logger_syslog.cxx
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <syslog.h>
 
-#include <rfb/util.h>
 #include <rfb/Logger_syslog.h>
 #include <rfb/LogWriter.h>
 

diff --git a/common/rfb/PixelBuffer.h b/common/rfb/PixelBuffer.h
index 052736990bf9f3a6bd1911d692e6c5526ae94a48..528f55c61d4be372d466eb06685f99419627d8b5 100644 (file)
--- a/common/rfb/PixelBuffer.h
+++ b/common/rfb/PixelBuffer.h
@@ -28,7 +28,6 @@
 #include <rfb/PixelFormat.h>
 #include <rfb/Rect.h>
 #include <rfb/Pixel.h>
-#include <rfb/util.h>
 
 namespace rfb {
 

diff --git a/common/rfb/PixelFormat.cxx b/common/rfb/PixelFormat.cxx
index 938ffb5b40f2f6e0cd590cff3136b159a270f80b..b3ea8182a9225f24fb447b2bf1e9594ed3facf7a 100644 (file)
--- a/common/rfb/PixelFormat.cxx
+++ b/common/rfb/PixelFormat.cxx
@@ -30,7 +30,6 @@
 #include <rdr/OutStream.h>
 #include <rfb/Exception.h>
 #include <rfb/PixelFormat.h>
-#include <rfb/util.h>
 
 #ifdef _WIN32
 #define strcasecmp _stricmp

diff --git a/common/rfb/SConnection.cxx b/common/rfb/SConnection.cxx
index a1755cb4db9f8d70d50810ec596f814554d42752..b6c209236b2103355395588ca0bfd41de6b9e803 100644 (file)
--- a/common/rfb/SConnection.cxx
+++ b/common/rfb/SConnection.cxx
@@ -36,6 +36,7 @@
 #include <rfb/encodings.h>
 #include <rfb/EncodeManager.h>
 #include <rfb/SSecurity.h>
+#include <rfb/util.h>
 
 #include <rfb/LogWriter.h>
 

diff --git a/common/rfb/SMsgHandler.cxx b/common/rfb/SMsgHandler.cxx
index 092d9f7ee0f1b1900eed306a40a2e831eaccb935..4ecfc2b2fc1539323d0081709373b57faf68c709 100644 (file)
--- a/common/rfb/SMsgHandler.cxx
+++ b/common/rfb/SMsgHandler.cxx
@@ -27,6 +27,7 @@
 #include <rfb/ScreenSet.h>
 #include <rfb/clipboardTypes.h>
 #include <rfb/encodings.h>
+#include <rfb/util.h>
 
 using namespace rfb;
 

diff --git a/common/rfb/SMsgReader.cxx b/common/rfb/SMsgReader.cxx
index 2884170470d5685a9debb71188a88a55d079302c..8cd8d147431f97b4c2595fa9786cca6c0578eed1 100644 (file)
--- a/common/rfb/SMsgReader.cxx
+++ b/common/rfb/SMsgReader.cxx
@@ -36,6 +36,7 @@
 #include <rfb/SMsgReader.h>
 #include <rfb/Configuration.h>
 #include <rfb/LogWriter.h>
+#include <rfb/util.h>
 
 using namespace rfb;
 

diff --git a/common/rfb/SSecurityPlain.cxx b/common/rfb/SSecurityPlain.cxx
index 5124a08ea4f0fadcdb3aa189012cf3a57269b72d..e65b6d3be9a4bc2d9c915f9457a00df3d25bf330 100644 (file)
--- a/common/rfb/SSecurityPlain.cxx
+++ b/common/rfb/SSecurityPlain.cxx
@@ -24,6 +24,7 @@
 #include <rfb/SSecurityPlain.h>
 #include <rfb/SConnection.h>
 #include <rfb/Exception.h>
+#include <rfb/util.h>
 #include <rdr/InStream.h>
 #if !defined(WIN32) && !defined(__APPLE__)
 #include <rfb/UnixPasswordValidator.h>

diff --git a/common/rfb/ServerCore.cxx b/common/rfb/ServerCore.cxx
index 274458faa4bafb2d1d49e8c311d827c66792a3d6..5bb6b9c961889278a9013e48d5e6740c9fda5dcb 100644 (file)
--- a/common/rfb/ServerCore.cxx
+++ b/common/rfb/ServerCore.cxx
@@ -26,7 +26,6 @@
 #endif
 
 #include <string.h>
-#include <rfb/util.h>
 #include <rfb/ServerCore.h>
 
 rfb::IntParameter rfb::Server::idleTimeout

diff --git a/common/rfb/ServerCore.h b/common/rfb/ServerCore.h
index 20a740a8589f3d420d7ddb16f53560d9106eb5b3..69cad39fda42ae1f069c284d081714f1c3a22c00 100644 (file)
--- a/common/rfb/ServerCore.h
+++ b/common/rfb/ServerCore.h
@@ -25,7 +25,6 @@
 #define __RFB_SERVER_CORE_H__
 
 #include <rfb/Configuration.h>
-#include <rfb/util.h>
 
 namespace rfb {
 

diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx
index 1d890c286471fa49a2ce8479adc4bc8c06b3ae65..b5e5b5832c9be049403579af5a6cad759448a5a8 100644 (file)
--- a/common/rfb/VNCSConnectionST.cxx
+++ b/common/rfb/VNCSConnectionST.cxx
@@ -40,6 +40,7 @@
 #define XK_MISCELLANY
 #define XK_XKB_KEYS
 #include <rfb/keysymdef.h>
+#include <rfb/util.h>
 
 using namespace rfb;
 

diff --git a/common/rfb/encodings.cxx b/common/rfb/encodings.cxx
index b33dc6dfea0747697522e6ee0cfe1eff6a5c192d..4acb569e2561a35524f054123c0c3c0699fd80fb 100644 (file)
--- a/common/rfb/encodings.cxx
+++ b/common/rfb/encodings.cxx
@@ -22,7 +22,6 @@
 
 #include <string.h>
 #include <rfb/encodings.h>
-#include <rfb/util.h>
 
 int rfb::encodingNum(const char* name)
 {

diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx
index 318e9f4e1f088d2532055a7cb790e18df75d9bae..c59520943d2b68ca06c3858ec5942a35518c12b1 100644 (file)
--- a/vncviewer/DesktopWindow.cxx
+++ b/vncviewer/DesktopWindow.cxx
@@ -30,6 +30,7 @@
 
 #include <rfb/LogWriter.h>
 #include <rfb/CMsgWriter.h>
+#include <rfb/util.h>
 
 #include "DesktopWindow.h"
 #include "OptionsDialog.h"

diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
index 66903c5f39ee083fc02e5c2e2f92471c2c7ee0ed..c501764ad0526acc4a23120471e33fef1bf3008d 100644 (file)
--- a/vncviewer/Viewport.cxx
+++ b/vncviewer/Viewport.cxx
@@ -29,6 +29,7 @@
 #include <rfb/LogWriter.h>
 #include <rfb/Exception.h>
 #include <rfb/ledStates.h>
+#include <rfb/util.h>
 
 // FLTK can pull in the X11 headers on some systems
 #ifndef XK_VoidSymbol

diff --git a/win/rfb_win32/AboutDialog.h b/win/rfb_win32/AboutDialog.h
index 0dd9d494d0fc45f1815ce3011f7ca12bbb20852a..705d6b3c48f11c901b4e8332d7225bcbb5bb5824 100644 (file)
--- a/win/rfb_win32/AboutDialog.h
+++ b/win/rfb_win32/AboutDialog.h
@@ -22,7 +22,6 @@
 #define __RFB_WIN32_ABOUT_DIALOG_H__
 
 #include <rfb_win32/Dialog.h>
-#include <rfb/util.h>
 
 extern const char* buildTime;
 

diff --git a/win/rfb_win32/SDisplayCorePolling.cxx b/win/rfb_win32/SDisplayCorePolling.cxx
index ae033511515b24af4a3aaae5589c423f5a711c25..bd8883e66466894247f78f93d7f7f469f543ea22 100644 (file)
--- a/win/rfb_win32/SDisplayCorePolling.cxx
+++ b/win/rfb_win32/SDisplayCorePolling.cxx
@@ -24,7 +24,6 @@
 
 #include <rfb_win32/SDisplayCorePolling.h>
 #include <rfb/LogWriter.h>
-#include <rfb/util.h>
 
 using namespace rfb;
 using namespace rfb::win32;

diff --git a/win/vncconfig/Connections.h b/win/vncconfig/Connections.h
index 888fd77bbbda5e1c64b2cc37f82061bb4b3f4e36..fcaae2034b9da662674e533940abd45a11575488 100644 (file)
--- a/win/vncconfig/Connections.h
+++ b/win/vncconfig/Connections.h
@@ -25,6 +25,7 @@
 #include <rfb_win32/ModuleFileName.h>
 #include <rfb/Configuration.h>
 #include <rfb/Blacklist.h>
+#include <rfb/util.h>
 #include <network/TcpSocket.h>
 
 static rfb::IntParameter port_number("PortNumber",

diff --git a/win/vncconfig/Legacy.cxx b/win/vncconfig/Legacy.cxx
index 7703c3a32b91bd444ce0b90406e9349421342974..3a22bb5275686b9fe315d169748c39be7a6a4975 100644 (file)
--- a/win/vncconfig/Legacy.cxx
+++ b/win/vncconfig/Legacy.cxx
@@ -19,6 +19,7 @@
 #include <vncconfig/Legacy.h>
 
 #include <rfb/LogWriter.h>
+#include <rfb/util.h>
 #include <rfb_win32/CurrentUser.h>
 
 using namespace rfb;

diff --git a/win/winvnc/VNCServerService.cxx b/win/winvnc/VNCServerService.cxx
index 4754d7203f025d244140d6cffe97251c3a1fb932..09a0707b06e4cb3cae7d3ffdc6522b9cb27d4d2a 100644 (file)
--- a/win/winvnc/VNCServerService.cxx
+++ b/win/winvnc/VNCServerService.cxx
@@ -24,6 +24,7 @@
 
 #include <winvnc/VNCServerService.h>
 #include <rfb/LogWriter.h>
+#include <rfb/util.h>
 #include <rfb_win32/TsSessions.h>
 #include <rfb_win32/ModuleFileName.h>
 #include <windows.h>

diff --git a/win/winvnc/winvnc.cxx b/win/winvnc/winvnc.cxx
index 604df12e2d903d30979baf196547bdb0d70f5174..512464070745cb454bd21223cf2d37a80046206e 100644 (file)
--- a/win/winvnc/winvnc.cxx
+++ b/win/winvnc/winvnc.cxx
@@ -31,6 +31,7 @@
 #include <rfb/Logger_stdio.h>
 #include <rfb/Logger_file.h>
 #include <rfb/LogWriter.h>
+#include <rfb/util.h>
 #include <rfb_win32/AboutDialog.h>
 #include <rfb_win32/MsgBox.h>
 #include <network/TcpSocket.h>