Changeset 18398 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

Mar 27, 2009 2:21:19 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

45196

Message:

HostServices/SharedClipboard: move the first code to the GuestHost directory

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• Makefile.kmk (modified) (1 diff)
• darwin-pasteboard.cpp (modified) (1 diff)
• x11-clipboard.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedClipboard/Makefile.kmk

@@ -38 +38 @@
 VBoxSharedClipboard_SOURCES.darwin = \
         darwin.cpp \
-        clipboard-helper.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp \
         darwin-pasteboard.cpp
 if1of ($(KBUILD_TARGET), linux solaris) ## @todo X11
  ifndef VBOX_HEADLESS
   VBoxSharedClipboard_SOURCES += \
-        clipboard-helper.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp \
         x11-clipboard.cpp
  else

trunk/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp

@@ -29 +29 @@
 #include "VBox/log.h"
 #include "VBox/HostServices/VBoxClipboardSvc.h"
-#include "clipboard-helper.h"
+#include "VBox/GuestHost/clipboard-helper.h"
 
 /* For debugging */

trunk/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp

@@ -21 +21 @@
  */
 
+#include <string.h>
+#include <stdio.h>
+#include <stdint.h>
+
+#ifdef RT_OS_SOLARIS
+#include <tsol/label.h>
+#endif
+
 #include <vector>
 
-#include <VBox/HostServices/VBoxClipboardSvc.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <X11/Intrinsic.h>
+#include <X11/Shell.h>
+#include <X11/Xproto.h>
+#include <X11/StringDefs.h>
 
 #include <iprt/alloc.h>
@@ -34 +47 @@
 #include <iprt/process.h>
 #include <iprt/semaphore.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdint.h>
+
+#include <VBox/GuestHost/clipboard-helper.h>
+#include <VBox/HostServices/VBoxClipboardSvc.h>
 
 #include "VBoxClipboard.h"
-#include "clipboard-helper.h"
-
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#include <X11/Intrinsic.h>
-#include <X11/Shell.h>
-#include <X11/Xproto.h>
-#include <X11/StringDefs.h>
-
-#ifdef RT_OS_SOLARIS
-#include <tsol/label.h>
-#endif
 
 /** Do we want to test Utf16 by disabling other text formats? */