From aad71cac54affd5cb91074e445b986b028540fc0 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Sun, 19 Sep 2010 18:10:46 +0000 Subject: [PATCH] 2010-09-19 11:00 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtcore/hbqt_hbslots.h - Deleted: references to QSessionManager(). * contrib/hbqt/qtgui/g/QApplication.cpp * contrib/hbqt/qtgui/qth/QApplication.qth ! QTextCodec::codecForLocale() => QTextCodec::codecForName( "UTF8" ) This synchronizes the codepage used by hbQT for its translation operations. It is not needed in QCoreApplication() because for all types of hbQT based applications QApplication() is ever to be called as first line. TODO: needed an option for users to set Harbour's recognized codepages. --- harbour/contrib/hbqt/qtcore/hbqt_hbslots.h | 4 ++-- harbour/contrib/hbqt/qtgui/g/QApplication.cpp | 2 +- harbour/contrib/hbqt/qtgui/qth/QApplication.qth | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/harbour/contrib/hbqt/qtcore/hbqt_hbslots.h b/harbour/contrib/hbqt/qtcore/hbqt_hbslots.h index 7e851ade40..a3878c2b3a 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_hbslots.h +++ b/harbour/contrib/hbqt/qtcore/hbqt_hbslots.h @@ -308,11 +308,11 @@ public slots: void dateTimeChanged( const QDateTime & datetime ); void timeChanged( const QTime & time ); /* QApplication */ - void commitDataRequest( QSessionManager & manager ); +// void commitDataRequest( QSessionManager & manager ); void focusChanged( QWidget * old, QWidget * now ); void fontDatabaseChanged(); void lastWindowClosed(); - void saveStateRequest( QSessionManager & manager ); +// void saveStateRequest( QSessionManager & manager ); /* Latest */ }; diff --git a/harbour/contrib/hbqt/qtgui/g/QApplication.cpp b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp index b8061c0db7..2db84e0654 100644 --- a/harbour/contrib/hbqt/qtgui/g/QApplication.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp @@ -116,7 +116,7 @@ static void hbqt_Init( void * cargo ) { HB_SYMBOL_UNUSED( cargo ); - QTextCodec *codec = QTextCodec::codecForLocale(); + QTextCodec * codec = QTextCodec::codecForName( "UTF8" ); QTextCodec::setCodecForTr( codec ); QTextCodec::setCodecForCStrings( codec ); diff --git a/harbour/contrib/hbqt/qtgui/qth/QApplication.qth b/harbour/contrib/hbqt/qtgui/qth/QApplication.qth index 354b93725a..5b390a7db8 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QApplication.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QApplication.qth @@ -108,7 +108,7 @@ static void hbqt_Init( void * cargo ) { HB_SYMBOL_UNUSED( cargo ); - QTextCodec *codec = QTextCodec::codecForLocale(); + QTextCodec * codec = QTextCodec::codecForName( "UTF8" ); QTextCodec::setCodecForTr( codec ); QTextCodec::setCodecForCStrings( codec );