Revision | 0b9c3e826a9f9ea67f18e4156ca9991de64757aa (tree) |
---|---|
Zeit | 2014-04-03 16:38:27 |
Autor | jakago <jakago777@gmai...> |
Commiter | jakago |
Qt5への対応(Q_WS関連)
@@ -25,7 +25,8 @@ HEADERS += mainwindow.h \ | ||
25 | 25 | scrambledialog.h \ |
26 | 26 | utility.h \ |
27 | 27 | mp3.h \ |
28 | - urldownloader.h | |
28 | + urldownloader.h \ | |
29 | + qt4qt5.h | |
29 | 30 | FORMS += mainwindow.ui \ |
30 | 31 | customizedialog.ui \ |
31 | 32 | messagewindow.ui \ |
@@ -28,6 +28,7 @@ | ||
28 | 28 | #include "urldownloader.h" |
29 | 29 | #include "utility.h" |
30 | 30 | #include "mp3.h" |
31 | +#include "qt4qt5.h" | |
31 | 32 | |
32 | 33 | #include <QCheckBox> |
33 | 34 | #include <QDir> |
@@ -47,7 +48,7 @@ | ||
47 | 48 | //#include <QtCrypto> |
48 | 49 | #include <QTemporaryFile> |
49 | 50 | |
50 | -#ifdef Q_WS_WIN | |
51 | +#ifdef QT4_QT5_WIN | |
51 | 52 | #define TimeOut " -m 10000 " |
52 | 53 | #else |
53 | 54 | #define TimeOut " -m 10 " |
@@ -127,7 +128,7 @@ bool DownloadThread::checkExecutable( QString path ) { | ||
127 | 128 | |
128 | 129 | bool DownloadThread::isFfmpegAvailable( QString& path ) { |
129 | 130 | path = Utility::applicationBundlePath() + "ffmpeg"; |
130 | -#ifdef Q_WS_WIN | |
131 | +#ifdef QT4_QT5_WIN | |
131 | 132 | path += ".exe"; |
132 | 133 | #endif |
133 | 134 | return checkExecutable( path ); |
@@ -182,7 +183,7 @@ void DownloadThread::downloadENews( bool re_read ) { | ||
182 | 183 | QString flv_app( "flv9/_definst_/" ); |
183 | 184 | QString flv_service_prefix_20090330( re_read ? "mp3:e-news-flv/" : "e-news-flv/" ); |
184 | 185 | QString flv_service_prefix_20090728( re_read ? "mp3:e-news-flv/" : "e-news/data/" ); |
185 | -#ifdef Q_WS_WIN | |
186 | +#ifdef QT4_QT5_WIN | |
186 | 187 | QString null( "nul" ); |
187 | 188 | #else |
188 | 189 | QString null( "/dev/null" ); |
@@ -318,7 +319,7 @@ void DownloadThread::downloadShower() { | ||
318 | 319 | QString flv_host = "flv.nhk.or.jp"; |
319 | 320 | QString flv_app = "ondemand/flv/"; |
320 | 321 | QString flv_service_prefix( "worldwave/common/movie/" ); |
321 | -#ifdef Q_WS_WIN | |
322 | +#ifdef QT4_QT5_WIN | |
322 | 323 | QString null( "nul" ); |
323 | 324 | #else |
324 | 325 | QString null( "/dev/null" ); |
@@ -518,7 +519,7 @@ bool DownloadThread::captureStream( QString kouza, QString hdate, QString file ) | ||
518 | 519 | QString extension = ui->comboBox_extension->currentText(); |
519 | 520 | outFileName = outBasename + "." + extension; |
520 | 521 | |
521 | -#ifdef Q_WS_WIN | |
522 | +#ifdef QT4_QT5_WIN | |
522 | 523 | QString null( "nul" ); |
523 | 524 | #else |
524 | 525 | QString null( "/dev/null" ); |
@@ -540,7 +541,7 @@ bool DownloadThread::captureStream( QString kouza, QString hdate, QString file ) | ||
540 | 541 | |
541 | 542 | Q_ASSERT( ffmpegHash.contains( extension ) ); |
542 | 543 | QString dstPath; |
543 | -#ifdef Q_WS_WIN | |
544 | +#ifdef QT4_QT5_WIN | |
544 | 545 | if ( true ) { |
545 | 546 | QTemporaryFile file; |
546 | 547 | if ( file.open() ) { |
@@ -590,7 +591,7 @@ bool DownloadThread::captureStream( QString kouza, QString hdate, QString file ) | ||
590 | 591 | QFile::remove( dstPath ); |
591 | 592 | return false; |
592 | 593 | } else { |
593 | -#ifdef Q_WS_WIN | |
594 | +#ifdef QT4_QT5_WIN | |
594 | 595 | QFile::rename( dstPath, outputDir + outFileName ); |
595 | 596 | #endif |
596 | 597 | return true; |
@@ -20,6 +20,7 @@ | ||
20 | 20 | |
21 | 21 | #include "mainwindow.h" |
22 | 22 | #include "utility.h" |
23 | +#include "qt4qt5.h" | |
23 | 24 | |
24 | 25 | #include <QtGui/QApplication> |
25 | 26 | #include <stdio.h> |
@@ -27,7 +28,7 @@ | ||
27 | 28 | int main(int argc, char *argv[]) |
28 | 29 | { |
29 | 30 | #if defined(QT_NO_DEBUG) |
30 | -#ifdef Q_WS_WIN | |
31 | +#ifdef QT4_QT5_WIN | |
31 | 32 | const char* null = "nul"; |
32 | 33 | #else |
33 | 34 | const char* null = "/dev/null"; |
@@ -24,6 +24,7 @@ | ||
24 | 24 | #include "customizedialog.h" |
25 | 25 | #include "scrambledialog.h" |
26 | 26 | #include "utility.h" |
27 | +#include "qt4qt5.h" | |
27 | 28 | |
28 | 29 | #include <QMessageBox> |
29 | 30 | #include <QByteArray> |
@@ -82,7 +83,7 @@ MainWindow::MainWindow( QWidget *parent ) | ||
82 | 83 | settings( ReadMode ); |
83 | 84 | this->setWindowTitle( this->windowTitle() + version() ); |
84 | 85 | |
85 | -#ifdef Q_WS_MAC // Macのウィンドウにはメニューが出ないので縦方向に縮める | |
86 | +#ifdef QT4_QT5_MAC // Macのウィンドウにはメニューが出ないので縦方向に縮める | |
86 | 87 | setMaximumHeight( maximumHeight() - menuBar()->height() ); |
87 | 88 | setMinimumHeight( maximumHeight() - menuBar()->height() ); |
88 | 89 | QRect rect = geometry(); |
@@ -90,7 +91,7 @@ MainWindow::MainWindow( QWidget *parent ) | ||
90 | 91 | rect.moveTop( rect.top() + menuBar()->height() ); // 4.6.3だとこれがないとウィンドウタイトルがメニューバーに隠れる |
91 | 92 | setGeometry( rect ); |
92 | 93 | #endif |
93 | -#ifdef Q_WS_X11 // Linuxでは高さが足りなくなるので縦方向に伸ばしておく | |
94 | +#ifdef Q_OS_LINUX // Linuxでは高さが足りなくなるので縦方向に伸ばしておく | |
94 | 95 | setMaximumHeight( maximumHeight() + X11_WINDOW_VERTICAL_INCREMENT ); |
95 | 96 | setMinimumHeight( maximumHeight() + X11_WINDOW_VERTICAL_INCREMENT ); |
96 | 97 | QRect rect = geometry(); |
@@ -98,7 +99,7 @@ MainWindow::MainWindow( QWidget *parent ) | ||
98 | 99 | setGeometry( rect ); |
99 | 100 | #endif |
100 | 101 | |
101 | -#if !defined( Q_WS_MAC ) && !defined( Q_WS_WIN ) | |
102 | +#if !defined( QT4_QT5_MAC ) && !defined( QT4_QT5_WIN ) | |
102 | 103 | QPoint bottomLeft = geometry().bottomLeft(); |
103 | 104 | bottomLeft += QPoint( 0, menuBar()->height() + statusBar()->height() + 3 ); |
104 | 105 | messagewindow.move( bottomLeft ); |
@@ -206,7 +207,7 @@ void MainWindow::settings( enum ReadWriteMode mode ) { | ||
206 | 207 | |
207 | 208 | if ( mode == ReadMode ) { // 設定読み込み |
208 | 209 | QVariant saved; |
209 | -#if defined( Q_WS_MAC ) || defined( Q_WS_WIN ) // X11では正しく憶えられないので位置をリストアしない | |
210 | +#if defined( QT4_QT5_MAC ) || defined( QT4_QT5_WIN ) // X11では正しく憶えられないので位置をリストアしない | |
210 | 211 | saved = settings.value( SETTING_GEOMETRY ); |
211 | 212 | if ( saved.type() == QVariant::Invalid ) |
212 | 213 | move( 70, 22 ); |
@@ -239,7 +240,7 @@ void MainWindow::settings( enum ReadWriteMode mode ) { | ||
239 | 240 | textComboBoxes[i].comboBox->setCurrentIndex( textComboBoxes[i].comboBox->findText( extension ) ); |
240 | 241 | } |
241 | 242 | } else { // 設定書き出し |
242 | -#if defined( Q_WS_MAC ) || defined( Q_WS_WIN ) | |
243 | +#if defined( QT4_QT5_MAC ) || defined( QT4_QT5_WIN ) | |
243 | 244 | settings.setValue( SETTING_GEOMETRY, saveGeometry() ); |
244 | 245 | #endif |
245 | 246 | if ( outputDirSpecified ) |
@@ -22,6 +22,7 @@ | ||
22 | 22 | #include "ui_messagewindow.h" |
23 | 23 | #include "mainwindow.h" |
24 | 24 | #include "utility.h" |
25 | +#include "qt4qt5.h" | |
25 | 26 | |
26 | 27 | #include <QtGui> |
27 | 28 | #include <QTextCursor> |
@@ -102,7 +103,7 @@ void MessageWindow::clearText() { | ||
102 | 103 | } |
103 | 104 | |
104 | 105 | void MessageWindow::settings( bool write ) { |
105 | -#if defined( Q_WS_MAC ) || defined( Q_WS_WIN ) | |
106 | +#if defined( QT4_QT5_MAC ) || defined( QT4_QT5_WIN ) | |
106 | 107 | QSettings settings( Utility::applicationBundlePath() + INI_FILE, QSettings::IniFormat ); |
107 | 108 | settings.beginGroup( SETTING_GROUP ); |
108 | 109 |
@@ -0,0 +1,12 @@ | ||
1 | +#ifndef QT4QT5_H | |
2 | +#define QT4QT5_H | |
3 | + | |
4 | +#if (QT_VERSION < 0x050000 && defined(Q_WS_WIN)||(QT_VERSION >= 0x050000 && defined(Q_OS_WIN))) | |
5 | +#define QT4_QT5_WIN | |
6 | +#endif | |
7 | + | |
8 | +#if (QT_VERSION < 0x050000 && defined(Q_WS_MAC)||(QT_VERSION >= 0x050000 && defined(Q_OS_MACX))) | |
9 | +#define QT4_QT5_MAC | |
10 | +#endif | |
11 | + | |
12 | +#endif // QT4QT5_H |
@@ -21,6 +21,7 @@ | ||
21 | 21 | #include "utility.h" |
22 | 22 | #include "urldownloader.h" |
23 | 23 | #include "mainwindow.h" |
24 | +#include "qt4qt5.h" | |
24 | 25 | |
25 | 26 | #include <QUrl> |
26 | 27 | #include <QRegExp> |
@@ -57,7 +58,7 @@ namespace { | ||
57 | 58 | // Macの場合はアプリケーションバンドル、それ以外はアプリケーションが含まれるディレクトリを返す |
58 | 59 | QString Utility::applicationBundlePath() { |
59 | 60 | QString result = QCoreApplication::applicationDirPath(); |
60 | -#ifdef Q_WS_MAC | |
61 | +#ifdef QT4_QT5_MAC | |
61 | 62 | result = QDir::cleanPath( result + UPUPUP ); |
62 | 63 | #endif |
63 | 64 | result += QDir::separator(); |