Move limitText() and getDisplayName() to utilui.cpp

Author: bear101

Client/qtTeamTalk/common.cpp

@@ -25,8 +25,6 @@
 #include <QStack>
 #include <QTemporaryFile>
 
-#define DEFAULT_NICKNAME           QT_TRANSLATE_NOOP("MainWindow", "NoName")
-
 extern QSettings* ttSettings;
 extern TTInstance* ttInst;
 
@@ -504,28 +502,6 @@ QString getVersion(const User& user)
         .arg(user.uVersion & 0xFF);
 }
 
-QString limitText(const QString& text)
-{
-    int len = ttSettings->value(SETTINGS_DISPLAY_MAX_STRING, SETTINGS_DISPLAY_MAX_STRING_DEFAULT).toInt();
-    if(text.size()>len+3 && !isScreenReaderActive())
-        return text.left(len) + "...";
-    return text;
-}
-
-QString getDisplayName(const User& user)
-{
-    if(ttSettings->value(SETTINGS_DISPLAY_SHOWUSERNAME,
-                         SETTINGS_DISPLAY_SHOWUSERNAME_DEFAULT).toBool())
-    {
-        return limitText(_Q(user.szUsername));
-    }
-
-    QString nickname = _Q(user.szNickname);
-    if (nickname.isEmpty())
-        nickname = QString("%1 - #%2").arg(QCoreApplication::translate("MainWindow", DEFAULT_NICKNAME)).arg(user.nUserID);
-    return limitText(nickname);
-}
-
 QString generateAudioStorageFilename(AudioFileFormat aff)
 {
     QString filename = getDateTimeStamp() + " ";

Client/qtTeamTalk/common.h

@@ -19,7 +19,6 @@
 #define COMMON_H
 
 #include "utiltt.h"
-#include "utiltts.h"
 
 #include <QList>
 #include <QFile>
@@ -201,8 +200,6 @@ QString userCacheID(const User& user);
 
 bool versionSameOrLater(const QString& check, const QString& against);
 QString getVersion(const User& user);
-QString limitText(const QString& text);
-QString getDisplayName(const User& user);
 
 QString generateAudioStorageFilename(AudioFileFormat aff);
 

Client/qtTeamTalk/moveusersdlg.cpp

@@ -16,7 +16,7 @@
  */
 
 #include "moveusersdlg.h"
-#include "common.h"
+#include "utilui.h"
 #include "appinfo.h"
 
 extern TTInstance* ttInst;

Client/qtTeamTalk/uservolumedlg.cpp

@@ -18,6 +18,7 @@
 #include "uservolumedlg.h"
 #include "appinfo.h"
 #include "utilsound.h"
+#include "utilui.h"
 #include <settings.h>
 
 #include <QMessageBox>

Client/qtTeamTalk/utilui.cpp

@@ -305,6 +305,31 @@ QString getBearWareWebLogin(QWidget* parent)
     return username;
 }
 
+
+QString limitText(const QString& text)
+{
+    int len = ttSettings->value(SETTINGS_DISPLAY_MAX_STRING, SETTINGS_DISPLAY_MAX_STRING_DEFAULT).toInt();
+    if(text.size()>len+3 && !isScreenReaderActive())
+        return text.left(len) + "...";
+    return text;
+}
+
+#define DEFAULT_NICKNAME           QT_TRANSLATE_NOOP("MainWindow", "NoName")
+
+QString getDisplayName(const User& user)
+{
+    if(ttSettings->value(SETTINGS_DISPLAY_SHOWUSERNAME,
+                         SETTINGS_DISPLAY_SHOWUSERNAME_DEFAULT).toBool())
+    {
+        return limitText(_Q(user.szUsername));
+    }
+
+    QString nickname = _Q(user.szNickname);
+    if (nickname.isEmpty())
+        nickname = QString("%1 - #%2").arg(QCoreApplication::translate("MainWindow", DEFAULT_NICKNAME)).arg(user.nUserID);
+    return limitText(nickname);
+}
+
 textmessages_t buildTextMessages(const TextMessage& msg, const QString& content)
 {
     Q_ASSERT(msg.szMessage[0] == '\0');

Client/qtTeamTalk/utilui.h

@@ -141,6 +141,8 @@ void setCurrentItemData(QComboBox* cbox, const QVariant& itemdata);
 QVariant getCurrentItemData(QComboBox* cbox, const QVariant& not_found = QVariant());
 
 QString getBearWareWebLogin(QWidget* parent);
+QString limitText(const QString& text);
+QString getDisplayName(const User& user);
 
 textmessages_t sendTextMessage(const TextMessage& msg, const QString& content);