Skip to content

Commit 7600d27

Browse files
hiroyuki-komatsuhiroyuki-komatsu
committed
Enable to build with Qt5 behind MOZC_USE_QT5 macro
The code for Qt5 is not ready for build or deploy on all target platform. The current build procedure does not define MOZC_USE_QT5 and this CL does not affect the current build with Qt4. BUG=#327 TEST= REF_BUG=26887740 REF_CL=113608649 REF_TIME=2016-02-02T17:38:07+09:00 REF_TIME_RAW=1454402287 +0900
1 parent ba37c0a commit 7600d27

File tree

62 files changed

+351
-17
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+351
-17
lines changed

‎src/gui/about_dialog/about_dialog.h

+4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@
3232
#ifndef MOZC_GUI_ABOUT_DIALOG_ABOUT_DIALOG_H_
3333
#define MOZC_GUI_ABOUT_DIALOG_ABOUT_DIALOG_H_
3434

35+
#ifdef MOZC_USE_QT5
36+
#include <QtWidgets/QDialog>
37+
#else
3538
#include <QtGui/QDialog>
39+
#endif
3640

3741
#include <memory>
3842

‎src/gui/about_dialog/about_dialog_libmain.cc

+4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@
2727
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2828
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929

30+
#ifdef MOZC_USE_QT5
31+
#include <QtGui/QGuiApplication>
32+
#else
3033
#include <QtGui/QApplication>
34+
#endif
3135
#include <QtGui/QtGui>
3236
#include "base/system_util.h"
3337
#include "gui/about_dialog/about_dialog.h"

‎src/gui/administration_dialog/administration_dialog.cc

+4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@
2929

3030
#include "gui/administration_dialog/administration_dialog.h"
3131

32+
#ifdef MOZC_USE_QT5
33+
#include <QtWidgets/QMessageBox>
34+
#else
3235
#include <QtGui/QMessageBox>
36+
#endif
3337
#include "base/run_level.h"
3438
#include "config/stats_config_util.h"
3539
#include "server/cache_service_manager.h"

‎src/gui/administration_dialog/administration_dialog.h

+4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@
3131
#define MOZC_GUI_ADMINISTRATION_DIALOG_H_
3232

3333
#include <QtGui/QtGui>
34+
#ifdef MOZC_USE_QT5
35+
#include <QtWidgets/QDialog>
36+
#else
3437
#include <QtGui/QDialog>
38+
#endif
3539
#include <string>
3640
#include "gui/administration_dialog/ui_administration_dialog.h"
3741

‎src/gui/administration_dialog/administration_dialog_libmain.cc

+4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@
2727
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2828
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929

30+
#ifdef MOZC_USE_QT5
31+
#include <QtGui/QGuiApplication>
32+
#else
3033
#include <QtGui/QApplication>
34+
#endif
3135
#include <QtGui/QtGui>
3236
#include "base/system_util.h"
3337
#include "gui/administration_dialog/administration_dialog.h"

‎src/gui/base/debug_util.cc

+24
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,33 @@
3131
#include "gui/base/debug_util.h"
3232

3333
#include "base/logging.h"
34+
#include "base/string_piece.h"
3435

3536
namespace mozc {
3637
namespace gui {
3738

39+
#ifdef MOZC_USE_QT5
40+
void DebugUtil::MessageHandler(QtMsgType type,
41+
const QMessageLogContext &context,
42+
const QString &q_msg) {
43+
QByteArray q_ba = q_msg.toUtf8();
44+
const StringPiece msg(q_ba.constData(), q_ba.size());
45+
switch (type) {
46+
case QtDebugMsg:
47+
LOG(INFO) << msg;
48+
break;
49+
case QtWarningMsg:
50+
LOG(WARNING) << msg;
51+
break;
52+
case QtCriticalMsg:
53+
LOG(ERROR) << msg;
54+
break;
55+
case QtFatalMsg:
56+
LOG(FATAL) << msg;
57+
break;
58+
}
59+
}
60+
#else // ! MOZC_USE_QT5
3861
void DebugUtil::MessageHandler(QtMsgType type, const char *msg) {
3962
switch (type) {
4063
case QtDebugMsg:
@@ -51,6 +74,7 @@ void DebugUtil::MessageHandler(QtMsgType type, const char *msg) {
5174
break;
5275
}
5376
}
77+
#endif // ! MOZC_USE_QT5
5478

5579
} // namespace gui
5680
} // namespace mozc

‎src/gui/base/debug_util.h

+10
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@
3333
#define MOZC_GUI_BASE_DEBUG_UTIL_H_
3434

3535
#include <string>
36+
#ifdef MOZC_USE_QT5
37+
#include <QtGui/QGuiApplication>
38+
#else
3639
#include <QtGui/QApplication>
40+
#endif
3741

3842
namespace mozc {
3943
namespace gui {
@@ -42,7 +46,13 @@ class DebugUtil {
4246
public:
4347
// Callback function used as a Qt message handler which is called when Qt
4448
// message functions (qDebug, qWarning, qCritical and qFatal) are called.
49+
#ifdef MOZC_USE_QT5
50+
static void MessageHandler(QtMsgType type,
51+
const QMessageLogContext &context,
52+
const QString &q_msg);
53+
#else
4554
static void MessageHandler(QtMsgType type, const char *msg);
55+
#endif
4656

4757
private:
4858
DebugUtil() {}

‎src/gui/base/locale_util.cc

+6
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@
6060
#endif // CHANNEL_DEV && GOOGLE_JAPANESE_INPUT_BUILD
6161

6262
#include <QtCore/QTextCodec>
63+
#ifdef MOZC_USE_QT5
64+
#include <QtGui/QGuiApplication>
65+
#else
6366
#include <QtGui/QApplication>
67+
#endif
6468
#include <QtGui/QtGui>
6569
#include <map>
6670
#include <string>
@@ -221,9 +225,11 @@ TranslationDataImpl::TranslationDataImpl()
221225
}
222226
#endif
223227

228+
#ifndef MOZC_USE_QT5
224229
// Set default encoding for multi-byte string to be UTF8
225230
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
226231
QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
232+
#endif
227233
}
228234

229235
void TranslationDataImpl::InstallTranslationMessagesAndFont(

‎src/gui/base/table_util.cc

+4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@
2929

3030
#include "gui/base/table_util.h"
3131

32+
#ifdef MOZC_USE_QT5
33+
#include <QtWidgets/QTableWidget>
34+
#else
3235
#include <QtGui/QTableWidget>
36+
#endif
3337

3438
namespace mozc {
3539
namespace gui {

‎src/gui/base/window_title_modifier.cc

+10
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,14 @@
2929

3030
#include <QtCore/QObject>
3131
#include <QtCore/QString>
32+
#ifdef MOZC_USE_QT5
33+
#include <QtGui/QGuiApplication>
34+
#include <QtWidgets/QApplication>
35+
#include <QtWidgets/QWidget>
36+
#else
3237
#include <QtGui/QApplication>
3338
#include <QtGui/QWidget>
39+
#endif
3440

3541
#include "base/version.h"
3642
#include "gui/base/window_title_modifier.h"
@@ -39,7 +45,11 @@ namespace mozc {
3945
namespace gui {
4046
bool WindowTitleModifier::eventFilter(QObject *obj,
4147
QEvent *event) {
48+
#ifdef MOZC_USE_QT5
49+
QWidget *w = QApplication::activeWindow();
50+
#else
4251
QWidget *w = qApp->activeWindow();
52+
#endif
4353
if (w != NULL && obj != NULL && w == obj &&
4454
QEvent::WindowActivate == event->type() &&
4555
w->windowTitle().indexOf(prefix_) == -1) {

‎src/gui/character_pad/character_pad_libmain.cc

+8-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@
3131
#include <windows.h>
3232
#endif
3333

34+
#ifdef MOZC_USE_QT5
35+
#include <QtGui/QGuiApplication>
36+
#else
3437
#include <QtGui/QApplication>
38+
#endif
3539
#include <QtCore/QFile>
3640

3741
#include <memory>
@@ -84,14 +88,15 @@ int RunCharacterPad(int argc, char *argv[],
8488
// Set Top-Most bit:
8589
// Use SWP_NOACTIVATE so that the GUI window will not get focus from the
8690
// application which is currently active. b/5516521
87-
::SetWindowPos(window->winId(), HWND_TOPMOST, 0, 0, 0, 0,
91+
HWND window_handle = reinterpret_cast<HWND>(window->winId());
92+
::SetWindowPos(window_handle, HWND_TOPMOST, 0, 0, 0, 0,
8893
SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
8994

9095
// Set WS_EX_NOACTIVATE so that the GUI window will not be activated by mouse
9196
// click.
92-
const LONG style = ::GetWindowLong(window->winId(), GWL_EXSTYLE)
97+
const LONG style = ::GetWindowLong(window_handle, GWL_EXSTYLE)
9398
| WS_EX_NOACTIVATE | WS_EX_APPWINDOW;
94-
::SetWindowLong(window->winId(), GWL_EXSTYLE, style);
99+
::SetWindowLong(window_handle, GWL_EXSTYLE, style);
95100
#endif
96101

97102
window->show();

‎src/gui/character_pad/character_palette.cc

+4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@
3030
#include "gui/character_pad/character_palette.h"
3131

3232
#include <QtGui/QtGui>
33+
#ifdef MOZC_USE_QT5
34+
#include <QtWidgets/QMessageBox>
35+
#else
3336
#include <QtGui/QMessageBox>
37+
#endif
3438

3539
#ifdef OS_WIN
3640
#include <Windows.h>

‎src/gui/character_pad/character_palette.h

+4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@
3131
#define MOZC_GUI_CHARACTER_PAD_CHARACTER_PALETTE_H_
3232

3333
#include <QtCore/QMap>
34+
#ifdef MOZC_USE_QT5
35+
#include <QtWidgets/QMainWindow>
36+
#else
3437
#include <QtGui/QMainWindow>
38+
#endif
3539

3640
#include <memory>
3741

‎src/gui/character_pad/character_palette_table_widget.cc

+4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131

3232
#include <QtGui/QtGui>
3333
#include <QtCore/QTextCodec>
34+
#ifdef MOZC_USE_QT5
35+
#include <QtWidgets/QToolTip>
36+
#endif
37+
3438
#include "gui/character_pad/selection_handler.h"
3539
#include "gui/character_pad/unicode_util.h"
3640

‎src/gui/character_pad/character_palette_table_widget.h

+4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@
3030
#ifndef MOZC_GUI_CHARACTER_PAD_CHARACTER_PALETTE_TABLE_WIDGET_H_
3131
#define MOZC_GUI_CHARACTER_PAD_CHARACTER_PALETTE_TABLE_WIDGET_H_
3232

33+
#ifdef MOZC_USE_QT5
34+
#include <QtWidgets/QTableWidget>
35+
#else
3336
#include <QtGui/QTableWidget>
37+
#endif
3438

3539
class QTextCodec;
3640
class QTableWidgetItem;

‎src/gui/character_pad/hand_writing.cc

+8-1
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,19 @@
2929

3030
#include "gui/character_pad/hand_writing.h"
3131

32+
#ifdef MOZC_USE_QT5
33+
#ifdef ENABLE_CLOUD_HANDWRITING
34+
#include <QtGui/QGuiApplication>
35+
#endif // ENABLE_CLOUD_HANDWRITING
36+
#include <QtGui/QtGui>
37+
#include <QtWidgets/QMessageBox>
38+
#else // ! MOZC_USE_QT5
3239
#ifdef ENABLE_CLOUD_HANDWRITING
3340
#include <QtGui/QApplication>
3441
#endif // ENABLE_CLOUD_HANDWRITING
3542
#include <QtGui/QtGui>
3643
#include <QtGui/QMessageBox>
37-
44+
#endif // ! MOZC_USE_QT5
3845
#ifdef OS_WIN
3946
#include <windows.h>
4047
#include <windowsx.h>

‎src/gui/character_pad/hand_writing.h

+4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@
3030
#ifndef MOZC_GUI_CHARACTER_PAD_HAND_WRITING_H_
3131
#define MOZC_GUI_CHARACTER_PAD_HAND_WRITING_H_
3232

33+
#ifdef MOZC_USE_QT5
34+
#include <QtWidgets/QMainWindow>
35+
#else
3336
#include <QtGui/QMainWindow>
37+
#endif
3438

3539
#include <memory>
3640

‎src/gui/character_pad/hand_writing_canvas.h

+4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@
3030
#ifndef MOZC_GUI_CHARACTER_PAD_HAND_WRITING_CANVAS_H_
3131
#define MOZC_GUI_CHARACTER_PAD_HAND_WRITING_CANVAS_H_
3232

33+
#ifdef MOZC_USE_QT5
34+
#include <QtWidgets/QWidget>
35+
#else
3336
#include <QtGui/QWidget>
37+
#endif
3438
#include <QtCore/QVector>
3539
#include <QtCore/QPair>
3640

‎src/gui/character_pad/hand_writing_thread.cc

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
// MutexLocker locks in the constructor and unlocks in the destructor.
3333
#include <QtCore/QMutexLocker>
3434
#include <QtGui/QtGui>
35+
#ifdef MOZC_USE_QT5
36+
#include <QtWidgets/QListWidgetItem>
37+
#endif
3538

3639
#include "base/clock.h"
3740
#include "base/logging.h"

‎src/gui/character_pad/result_list.cc

+4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131

3232
#include <QtCore/QStringList>
3333
#include <QtGui/QtGui>
34+
#ifdef MOZC_USE_QT5
35+
#include <QtWidgets/QToolTip>
36+
#endif
37+
3438
#include "gui/character_pad/selection_handler.h"
3539
#include "gui/character_pad/unicode_util.h"
3640

‎src/gui/character_pad/result_list.h

+5
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,13 @@
3131
#define MOZC_GUI_CHARACTER_PAD_RESULT_LIST_H_
3232

3333
#include <QtCore/QStringList>
34+
#ifdef MOZC_USE_QT5
35+
#include <QtWidgets/QWidget>
36+
#include <QtWidgets/QListWidget>
37+
#else
3438
#include <QtGui/QWidget>
3539
#include <QtGui/QListWidget>
40+
#endif
3641

3742
namespace mozc {
3843
namespace gui {

‎src/gui/character_pad/selection_handler.cc

+7
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,16 @@
2929

3030
#include "gui/character_pad/selection_handler.h"
3131

32+
#ifdef MOZC_USE_QT5
33+
#include <QtGui/QGuiApplication>
34+
#include <QtGui/QClipboard>
35+
#include <QtWidgets/QApplication>
36+
#include <QtWidgets/QMessageBox>
37+
#else
3238
#include <QtGui/QApplication>
3339
#include <QtGui/QClipboard>
3440
#include <QtGui/QMessageBox>
41+
#endif
3542

3643
#include "base/singleton.h"
3744

0 commit comments

Comments
 (0)