[KEncodingProber] Use in-class initialization for prober members (41019af0) · Commits · Frameworks / KCodecs · GitLab
Commit 41019af0 authored by Stefan Brüns's avatar Stefan Brüns
Browse files
parent b4075408
Loading
Loading
Loading
Loading
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ UnicodeGroupProber::UnicodeGroupProber()
          std::make_unique<nsCodingStateMachine>(&UCS2BESMModel),
      }
{
    mActiveSM = NUM_OF_UNICODE_CHARSETS;
    mState = eDetecting;
    mDetectedCharset = "UTF-8";
}

void UnicodeGroupProber::Reset(void)
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ public:

protected:
    std::unique_ptr<nsCodingStateMachine> mCodingSM[NUM_OF_UNICODE_CHARSETS];
    unsigned int mActiveSM;
    nsProbingState mState;
    const char *mDetectedCharset;
    unsigned int mActiveSM = NUM_OF_UNICODE_CHARSETS;
    nsProbingState mState = eDetecting;
    const char *mDetectedCharset = "UTF-8";
};
}
#endif /* UNICODEGROUPPROBER_H */
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ namespace kencodingprober
nsBig5Prober::nsBig5Prober()
    : mCodingSM{std::make_unique<nsCodingStateMachine>(&Big5SMModel)}
{
    Reset();
}

void nsBig5Prober::Reset(void)
Original line number Diff line number Diff line
@@ -35,11 +35,12 @@ public:

protected:
    std::unique_ptr<nsCodingStateMachine> mCodingSM;
    nsProbingState mState;
    nsProbingState mState = eDetecting;

    // Big5ContextAnalysis mContextAnalyser;
    Big5DistributionAnalysis mDistributionAnalyser;
    char mLastChar[2];

    char mLastChar[2] = {0};
};
}

Original line number Diff line number Diff line
@@ -24,9 +24,7 @@ typedef enum {
class KCODECS_NO_EXPORT nsCharSetProber
{
public:
    virtual ~nsCharSetProber()
    {
    }
    virtual ~nsCharSetProber() = default;
    virtual const char *GetCharSetName() = 0;
    virtual nsProbingState HandleData(const char *aBuf, unsigned int aLen) = 0;
    virtual nsProbingState GetState(void) = 0;
Loading