cbs: Tweak bestScheme implementation

in QCBSMessage class

2 files changed, 9 insertions, 2 deletions

diff --git a/src/qcbsmessage.cpp b/src/qcbsmessage.cpp
index 0556cc0..e4403ae 100644
--- a/src/qcbsmessage.cpp
+++ b/src/qcbsmessage.cpp
@@ -396,9 +396,15 @@ void QCBSMessage::print()
                   << ", text=" << text();
 }
 
-static QSMSDataCodingScheme bestScheme( const QString& body )
+/*!
+    Returns the best CBS data coding scheme to use for this
+    message, determined by an inspection of the plain text body.
+
+*/
+int QCBSMessage::bestScheme() const
 {
     QTextCodec *codec = QAtUtils::codec( "gsm-noloss" );
+    QString body = text();
     uint len = body.length();
     bool gsmSafe;
 
@@ -427,7 +433,7 @@ QByteArray QCBSMessage::toPdu() const
     QSMSDataCodingScheme scheme;
 
     if(dataCodingScheme() == -1)
-        scheme = bestScheme( text() );
+        scheme = (QSMSDataCodingScheme)bestScheme();
     else
         scheme = (QSMSDataCodingScheme)dataCodingScheme();
 
diff --git a/src/qcbsmessage.h b/src/qcbsmessage.h
index f6ed364..0f055b7 100644
--- a/src/qcbsmessage.h
+++ b/src/qcbsmessage.h
@@ -96,6 +96,7 @@ public:
     QByteArray toPdu() const;
     static QCBSMessage fromPdu( const QByteArray& pdu );
 
+    int bestScheme() const;
     bool shouldSplit() const;
     QList<QCBSMessage> split() const;
     void computeSize( uint& numPages, uint& spaceLeftInLast ) const;