consistent_naming++

[quassel.git] / src / qtgui / style.h

diff --git a/src/qtgui/style.h b/src/qtgui/style.h
index 861d5c5..68b52da 100644 (file)
--- a/src/qtgui/style.h
+++ b/src/qtgui/style.h
@@ -22,7 +22,8 @@
 #define _STYLE_H_
 
 #include <QtCore>
-#include <QtGui>
+#include <QTextCharFormat>
+#include <QTextLayout>
 
 class Style {
 
@@ -34,15 +35,13 @@ class Style {
       QUrl url;
     };
 
-    struct FormattedString {
+    struct StyledString {
       QString text;
       QList<QTextLayout::FormatRange> formats;
       QList<UrlInfo> urls;
     };
 
-    static QString mircToInternal(QString);
-    //static QString internalToMirc(QString);
-    static FormattedString internalToFormatted(QString);
+    static StyledString formattedToStyled(QString);
     static int sepTsSender() { return 10; }
     static int sepSenderText() { return 10; }