Changeset 2171 for code/trunk/src/util/Clipboard.h

Timestamp:

Nov 10, 2008, 12:05:03 AM (16 years ago)

Author:

landauf

Message:

merged revisions 2111-2170 from objecthierarchy branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/Clipboard.h (modified) (2 diffs)

code/trunk/src/util/Clipboard.h

@@ -28 +28 @@
 
 /**
-    @file Clipboard.h
+    @file
     @brief Some functions to exchange text between the OS clipboard and Orxonox.
 
@@ -46 +46 @@
 #include <string>
 
-
-_UtilExport bool toClipboard(const std::string& text);
-_UtilExport std::string fromClipboard();
-
+namespace orxonox
+{
+    _UtilExport bool toClipboard(const std::string& text);
+    _UtilExport std::string fromClipboard();
+}
 
 #endif /* _Clipboard_H__ */