Changeset 6439 for trunk/osd

Timestamp:

07/09/08 17:46:23 (5 months ago)

Author:

flynd

Message:

Removed using clause from plugin headers.

Location:

trunk/osd/src

Files:

• licq-osd.cpp (modified) (2 diffs)
• my_xosd.cpp (modified) (1 diff)
• my_xosd.h (modified) (3 diffs)

trunk/osd/src/licq-osd.cpp

@@ -2 +2 @@
 // author: Martin Maurer (martinmaurer@gmx.at)
 // first version 7 Apr 2003
+
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
+#include <iconv.h>
+#include <iostream>
+#include <langinfo.h>
+#include <libintl.h>
+#include <locale.h>
+#include <unistd.h>
 
 #include <licq_plugin.h>
@@ -8 +19 @@
 #include <licq_file.h>
 #include <licq_log.h>
-#include <time.h>
-#include <unistd.h>
-#include <iostream>
-#include <iconv.h>
-#include <errno.h>
-#include <locale.h>
-#include <langinfo.h>
-#include <cstdio>
-#include <cstring>
-#include <libintl.h>
 
 #include "my_xosd.h"
 #include "licq_osd.conf.h"
-                                 
+
+using namespace std;
+
 //#if CVSLICQ==1
 //#warning compiling for licq>=1.2.8

trunk/osd/src/my_xosd.cpp

@@ -4 +4 @@
 
 #include "my_xosd.h"
-#include <string>
-#include <unistd.h>
+
 #include <iostream>
 #include <libintl.h>
 #include <sstream>
+#include <string>
+#include <unistd.h>
 #define _(String) gettext (String)
+
+using namespace std;
 
 extern void log(int mode, const char *message);

trunk/osd/src/my_xosd.h

@@ -6 +6 @@
 #define my_xosd_h
 
-#include <xosd.h>
 #include <string>
 
-using namespace std;
+#include <xosd.h>
 
-int my_xosd_init(string font, // font which should be used (in xfontsel form)
-         string colour, // colour of OSD (as in Xfree86's rgb.txt)
+int my_xosd_init(std::string font, // font which should be used (in xfontsel form)
+    std::string colour, // colour of OSD (as in Xfree86's rgb.txt)
          unsigned long hoffset, // offset from left/right of screen
          unsigned long voffset, // offset from top/bottom of screen
-         string vpos, // vertical position = top, bottom
-                 string hpos, // horizontal position = left, right
+    std::string vpos, // vertical position = top, bottom
+    std::string hpos, // horizontal position = left, right
          unsigned long timeout, // how long to display a message
                  unsigned long delaypercharacter,
@@ -24 +23 @@
          unsigned long shadowoffset,
          unsigned long outlineoffset,
-     string shadowcolour,
-     string outlinecolour
+    std::string shadowcolour,
+    std::string outlinecolour
         );
 int my_xosd_exit();
@@ -35 +34 @@
 // intended - that only works correctly if the chosen font is
 // fixed width
-int my_xosd_display(string username, string message, string colour = "");
+int my_xosd_display(std::string username, std::string message, std::string colour = "");
 
 // Maximum length of each line in OSD