diff -r df16950e242e -r a581f3c08c9a plugins/consoles/vt100cons/inc/vtc_base.h --- a/plugins/consoles/vt100cons/inc/vtc_base.h Sat Jul 31 21:32:20 2010 +0100 +++ b/plugins/consoles/vt100cons/inc/vtc_base.h Wed Aug 25 21:19:19 2010 +0100 @@ -17,8 +17,9 @@ #include #include #include +#include -class CVtcConsoleBase : public CConsoleBase, public MConsoleOutput, public MConsoleInput +class CVtcConsoleBase : public CConsoleBase, public MConsoleOutput, public MConsoleInput, public MIosrvConsoleHelper { public: IMPORT_C virtual ~CVtcConsoleBase(); @@ -38,19 +39,9 @@ IMPORT_C virtual TUint KeyModifiers() const; IMPORT_C virtual TInt Extension_(TUint aExtensionId, TAny*& a0, TAny* a1); protected: - enum TVerbosity - { - EInformation, - EError, - EDebug, - }; -protected: - IMPORT_C void Message(TVerbosity aVerbosity, TRefByValue aFmt, ...); - IMPORT_C TBool Debug(); - IMPORT_C void SetDebug(TBool aDebug); -protected: IMPORT_C CVtcConsoleBase(); IMPORT_C virtual void ConstructL(const TDesC& aTitle); + IMPORT_C void ConstructL(const TDesC& aTitle, TBool aConsoleSupportsSizeDetect); // Note this is NOT virtual, only used for baseclasses to call up to from their overload of ConstructL(const TDesC&) if they explicitly don't support console size detect IMPORT_C static TInt ReadKeywordValuePair(TLex& aLex, TPtrC& aKeyword, TPtrC& aValue); private: @@ -62,9 +53,6 @@ CVtConsoleOutputController* iOutputController; CVtConsoleInputController* iInputController; LtkUtils::CIniFile* iIniFile; - TInt iDebug; -protected: - CConsoleBase* iUnderlyingConsole; };