Menu
▾
▴
[QTerm-cvs] SF.net SVN: qterm:[1322] trunk/qterm
|
From: <si...@us...> - 2013-06-13 14:55:00
|
Revision: 1322
http://sourceforge.net/p/qterm/code/1322
Author: sidos
Date: 2013-06-13 14:54:57 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
Add Qt5 support
Modified Paths:
--------------
trunk/qterm/CMakeLists.txt
trunk/qterm/src/CMakeLists.txt
trunk/qterm/src/aboutdialog.cpp
trunk/qterm/src/aboutdialog.h
trunk/qterm/src/addrdialog.cpp
trunk/qterm/src/addrdialog.h
trunk/qterm/src/articledialog.cpp
trunk/qterm/src/articledialog.h
trunk/qterm/src/blur.h
trunk/qterm/src/charpane.cpp
trunk/qterm/src/charpane.h
trunk/qterm/src/chartable.cpp
trunk/qterm/src/closedialog.cpp
trunk/qterm/src/closedialog.h
trunk/qterm/src/dbus.cpp
trunk/qterm/src/dommodel.cpp
trunk/qterm/src/hostinfo.cpp
trunk/qterm/src/imagelistviewer.cpp
trunk/qterm/src/imageviewer.cpp
trunk/qterm/src/keydialog.cpp
trunk/qterm/src/keydialog.h
trunk/qterm/src/msgdialog.cpp
trunk/qterm/src/msgdialog.h
trunk/qterm/src/osdmessage.cpp
trunk/qterm/src/overlayWidget.cpp
trunk/qterm/src/pallete.cpp
trunk/qterm/src/pallete.h
trunk/qterm/src/po/CMakeLists.txt
trunk/qterm/src/popupMessage.cpp
trunk/qterm/src/popwidget.cpp
trunk/qterm/src/prefdialog.cpp
trunk/qterm/src/prefdialog.h
trunk/qterm/src/progressBar.cpp
trunk/qterm/src/qtermbuffer.cpp
trunk/qterm/src/qtermcanvas.cpp
trunk/qterm/src/qtermcanvas.h
trunk/qterm/src/qtermconfig.cpp
trunk/qterm/src/qtermdecode.cpp
trunk/qterm/src/qtermframe.cpp
trunk/qterm/src/qtermglobal.cpp
trunk/qterm/src/qtermhttp.cpp
trunk/qterm/src/qtermhttp.h
trunk/qterm/src/qtermiplocation.cpp
trunk/qterm/src/qtermscreen.cpp
trunk/qterm/src/qtermsocket.cpp
trunk/qterm/src/qtermsound.cpp
trunk/qterm/src/qtermtelnet.cpp
trunk/qterm/src/qtermtextline.cpp
trunk/qterm/src/qtermtimelabel.cpp
trunk/qterm/src/qtermtimelabel.h
trunk/qterm/src/qtermtoolbutton.cpp
trunk/qterm/src/qtermwindow.cpp
trunk/qterm/src/qtermwindow.h
trunk/qterm/src/qtermwindowbase.cpp
trunk/qterm/src/qtermzmodem.cpp
trunk/qterm/src/quickdialog.cpp
trunk/qterm/src/quickdialog.h
trunk/qterm/src/schemedialog.cpp
trunk/qterm/src/schemedialog.h
trunk/qterm/src/scripthelper.cpp
trunk/qterm/src/shortcutsdialog.cpp
trunk/qterm/src/shortcutsdialog.h
trunk/qterm/src/soundconf.cpp
trunk/qterm/src/soundconf.h
trunk/qterm/src/ssh/auth.cpp
trunk/qterm/src/ssh/channel.cpp
trunk/qterm/src/ssh/kex.cpp
trunk/qterm/src/ssh/packet.cpp
trunk/qterm/src/ssh/socket.cpp
trunk/qterm/src/statusBar.cpp
trunk/qterm/src/statusBar.h
trunk/qterm/src/toolbardialog.cpp
trunk/qterm/src/wallet.cpp
trunk/qterm/src/zmodemdialog.cpp
trunk/qterm/src/zmodemdialog.h
Modified: trunk/qterm/CMakeLists.txt
===================================================================
--- trunk/qterm/CMakeLists.txt 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/CMakeLists.txt 2013-06-13 14:54:57 UTC (rev 1322)
@@ -1,14 +1,26 @@
project(qterm)
include(CTest)
-cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR)
set(QTERM_VERSION_MAJOR 0)
set(QTERM_VERSION_MINOR 5)
set(QTERM_VERSION_RELEASE 12)
set(QTERM_VERSION "${QTERM_VERSION_MAJOR}.${QTERM_VERSION_MINOR}.${QTERM_VERSION_RELEASE}" )
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-find_package(Qt4 4.5.0 REQUIRED)
-find_package(KDE4)
+set(CMAKE_AUTOMOC ON)
+IF(QT5)
+ find_package(Qt5Core)
+ find_package(Qt5Gui)
+ find_package(Qt5Widgets)
+ find_package(Qt5Xml)
+ find_package(Qt5Network)
+ find_package(Qt5PrintSupport)
+ find_package(Qt5LinguistTools)
+ELSE(QT5)
+ find_package(Qt4 4.5.0 REQUIRED)
+ find_package(KDE4)
+ENDIF(QT5)
+
IF(WIN32 AND MSVC)
ADD_DEFINITIONS (/D _CRT_SECURE_NO_WARNINGS)
ENDIF(WIN32 AND MSVC)
Modified: trunk/qterm/src/CMakeLists.txt
===================================================================
--- trunk/qterm/src/CMakeLists.txt 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/CMakeLists.txt 2013-06-13 14:54:57 UTC (rev 1322)
@@ -223,15 +223,28 @@
set(optionalLibs ${optionalLibs} ${WIN32_WS2_LIBRARY})
endif(WIN32_WS2_LIBRARY)
endif(WIN32)
-qt4_add_resources(qterm_RCCS_SRCS ${qterm_RCCS})
-qt4_wrap_ui(qterm_UIS_H ${qterm_UIS})
-qt4_automoc(${qterm_SRCS})
+if(QT5)
+ qt5_add_resources(qterm_RCCS_SRCS ${qterm_RCCS})
+ qt5_wrap_ui(qterm_UIS_H ${qterm_UIS})
+else(QT5)
+ qt4_add_resources(qterm_RCCS_SRCS ${qterm_RCCS})
+ qt4_wrap_ui(qterm_UIS_H ${qterm_UIS})
+endif(QT5)
add_definitions( -DHAVE_CONFIG_H )
+if(QT5)
include_directories(
+ ${Qt5Qt_INCLUDE_DIRS}
+ ${Qt5Widgets_INCLUDE_DIRS}
+ ${Qt5Core_INCLUDE_DIRS}
+ ${Qt5Network_INCLUDE_DIRS}
+ )
+else(QT5)
+include_directories(
${QT_INCLUDE_DIR}
${QT_QTCORE_INCLUDE_DIR}
${QT_QTGUI_INCLUDE_DIR}
${QT_QTNETWORK_INCLUDE_DIR} )
+endif(QT5)
if(UNIX AND NOT APPLE)
find_package(X11)
include_directories(${X11_INCLUDE_DIR})
@@ -263,13 +276,24 @@
else()
add_executable(${PROGRAME} ${qterm_SRCS} ${qterm_RCCS_SRCS})
endif()
+if(QT5)
target_link_libraries(${PROGRAME}
+ ${Qt5Core_LIBRARIES}
+ ${Qt5Gui_LIBRARIES}
+ ${Qt5Widgets_LIBRARIES}
+ ${Qt5Xml_LIBRARIES}
+ ${Qt5PrintSupport_LIBRARIES}
+ ${Qt5Network_LIBRARIES}
+ ${optionalLibs})
+else(QT5)
+target_link_libraries(${PROGRAME}
${QT_LIBRARIES}
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTNETWORK_LIBRARY}
${QT_QTXML_LIBRARY}
${optionalLibs})
+endif(QT5)
if(WIN32 AND MINGW)
target_link_libraries(${PROGRAME} ${win32Libs})
endif(WIN32 AND MINGW)
Modified: trunk/qterm/src/aboutdialog.cpp
===================================================================
--- trunk/qterm/src/aboutdialog.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/aboutdialog.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -26,7 +26,7 @@
namespace QTerm
{
-aboutDialog::aboutDialog( QWidget* parent, Qt::WFlags fl )
+aboutDialog::aboutDialog( QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl )
{
QString pathLib = Global::instance()->pathLib();
@@ -57,4 +57,4 @@
} // namespace QTerm
-#include <aboutdialog.moc>
+#include <moc_aboutdialog.cpp>
Modified: trunk/qterm/src/aboutdialog.h
===================================================================
--- trunk/qterm/src/aboutdialog.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/aboutdialog.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -12,6 +12,7 @@
//#include <qwidget.h>
//#include "ui/ui_aboutdialog.h"
#include "ui_aboutdialog.h"
+#include <Qt>
namespace QTerm
{
class aboutDialog : public QDialog
@@ -19,7 +20,7 @@
Q_OBJECT
public:
- aboutDialog( QWidget* parent = 0, Qt::WFlags fl = 0 );
+ aboutDialog( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
~aboutDialog();
private:
Ui::aboutDialog ui;
Modified: trunk/qterm/src/addrdialog.cpp
===================================================================
--- trunk/qterm/src/addrdialog.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/addrdialog.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -36,7 +36,7 @@
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
-addrDialog::addrDialog(QWidget* parent, bool partial, Qt::WFlags fl)
+addrDialog::addrDialog(QWidget* parent, bool partial, Qt::WindowFlags fl)
: QDialog(parent, fl), bPartial(partial), bgMenu(this)
{
ui.setupUi(this);
@@ -317,7 +317,7 @@
void addrDialog::onMenuColor()
{
QColor color = QColorDialog::getColor(clrMenu);
- if (color.isValid() == TRUE) {
+ if (color.isValid()) {
clrMenu = color;
}
}
@@ -325,7 +325,6 @@
void addrDialog::connectSlots()
{
connect(ui.nameTreeView, SIGNAL(clicked(QModelIndex)), this, SLOT(onNamechange(QModelIndex)));
- connect(ui.nameTreeView->selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)), this, SLOT(onNamechange(QModelIndex)));
connect(ui.nameTreeView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(onConnect(QModelIndex)));
connect(ui.nameTreeView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onPopupTreeContextMenu(QPoint)));
@@ -525,5 +524,5 @@
} // namespace QTerm
-#include <addrdialog.moc>
+#include <moc_addrdialog.cpp>
Modified: trunk/qterm/src/addrdialog.h
===================================================================
--- trunk/qterm/src/addrdialog.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/addrdialog.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -22,7 +22,7 @@
Q_OBJECT
public:
- addrDialog(QWidget* parent = 0, bool partial = false, Qt::WFlags fl = 0);
+ addrDialog(QWidget* parent = 0, bool partial = false, Qt::WindowFlags fl = 0);
~addrDialog();
Param param;
Modified: trunk/qterm/src/articledialog.cpp
===================================================================
--- trunk/qterm/src/articledialog.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/articledialog.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -19,7 +19,7 @@
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
-articleDialog::articleDialog(QWidget* parent, Qt::WFlags fl)
+articleDialog::articleDialog(QWidget* parent, Qt::WindowFlags fl)
: QDialog(parent, fl)
{
@@ -58,4 +58,4 @@
} // namespace QTerm
-#include <articledialog.moc>
+#include <moc_articledialog.cpp>
Modified: trunk/qterm/src/articledialog.h
===================================================================
--- trunk/qterm/src/articledialog.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/articledialog.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -18,7 +18,7 @@
Q_OBJECT
public:
- articleDialog(QWidget* parent = 0, Qt::WFlags fl = 0);
+ articleDialog(QWidget* parent = 0, Qt::WindowFlags fl = 0);
~articleDialog();
QString strArticle;
Modified: trunk/qterm/src/blur.h
===================================================================
--- trunk/qterm/src/blur.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/blur.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -25,7 +25,11 @@
02110-1301 USA.
*/
+#if QT_VERSION >= 0x050000
+#include <QtWidgets/QWidget>
+#else
#include <QtGui/QWidget>
+#endif
namespace QTerm
{
Modified: trunk/qterm/src/charpane.cpp
===================================================================
--- trunk/qterm/src/charpane.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/charpane.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -123,4 +123,4 @@
}
-#include "charpane.moc"
+#include "moc_charpane.cpp"
Modified: trunk/qterm/src/charpane.h
===================================================================
--- trunk/qterm/src/charpane.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/charpane.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -1,10 +1,15 @@
#ifndef CHARPANE_H
#define CHARPANE_H
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QFrame>
+#else
#include <QtGui/QWidget>
#include <QtGui/QFrame>
-#include <QtCore/QMap>
-#include <QtCore/QString>
+#endif
class QToolButton;
class QVBoxLayout;
Modified: trunk/qterm/src/chartable.cpp
===================================================================
--- trunk/qterm/src/chartable.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/chartable.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -92,4 +92,4 @@
}
-#include "chartable.moc"
+#include "moc_chartable.cpp"
Modified: trunk/qterm/src/closedialog.cpp
===================================================================
--- trunk/qterm/src/closedialog.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/closedialog.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -16,7 +16,7 @@
namespace QTerm
{
-CloseDialog::CloseDialog(QWidget * parent, Qt::WFlags fl)
+CloseDialog::CloseDialog(QWidget * parent, Qt::WindowFlags fl)
: QDialog(parent, fl),m_count(30)
{
ui.setupUi(this);
@@ -49,4 +49,4 @@
} // namespace QTerm
-#include <closedialog.moc>
+#include <moc_closedialog.cpp>
Modified: trunk/qterm/src/closedialog.h
===================================================================
--- trunk/qterm/src/closedialog.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/closedialog.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -22,7 +22,7 @@
Q_OBJECT
public:
- CloseDialog(QWidget* parent = 0, Qt::WFlags fl = 0);
+ CloseDialog(QWidget* parent = 0, Qt::WindowFlags fl = 0);
~CloseDialog();
void setSiteList(const QStringList & list);
Ui::closeDialog ui;
Modified: trunk/qterm/src/dbus.cpp
===================================================================
--- trunk/qterm/src/dbus.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/dbus.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -186,4 +186,4 @@
}
} // namespace QTerm
-#include <dbus.moc>
+#include <moc_dbus.cpp>
Modified: trunk/qterm/src/dommodel.cpp
===================================================================
--- trunk/qterm/src/dommodel.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/dommodel.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -5,7 +5,6 @@
#include <QtCore/QFile>
#include <QtCore/QTextStream>
#include <QtCore/QUuid>
-#include <QtGui/QMessageBox>
#include <QtGui/QIcon>
namespace QTerm
@@ -528,4 +527,4 @@
} //namespace QTerm
-#include <dommodel.moc>
+#include <moc_dommodel.cpp>
Modified: trunk/qterm/src/hostinfo.cpp
===================================================================
--- trunk/qterm/src/hostinfo.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/hostinfo.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -1,5 +1,9 @@
#include "hostinfo.h"
+#if QT_VERSION >= 0x050000
+#include <QtWidgets/QInputDialog>
+#else
#include <QtGui/QInputDialog>
+#endif
namespace QTerm
{
Modified: trunk/qterm/src/imagelistviewer.cpp
===================================================================
--- trunk/qterm/src/imagelistviewer.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/imagelistviewer.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -138,4 +138,4 @@
} // namespace QTerm
-#include <imagelistviewer.moc>
+#include <moc_imagelistviewer.cpp>
Modified: trunk/qterm/src/imageviewer.cpp
===================================================================
--- trunk/qterm/src/imageviewer.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/imageviewer.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -16,7 +16,7 @@
{
ui.setupUi(this);
- d_extensionShown = TRUE;
+ d_extensionShown = true;
/*
ui.d_browser->setText("Hide Browser");
@@ -94,4 +94,4 @@
} // namespace QTerm
-#include <imageviewer.moc>
+#include <moc_imageviewer.cpp>
Modified: trunk/qterm/src/keydialog.cpp
===================================================================
--- trunk/qterm/src/keydialog.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/keydialog.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -21,7 +21,7 @@
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
-keyDialog::keyDialog( QWidget* parent, Qt::WFlags fl )
+keyDialog::keyDialog( QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl ),bgKey(this)
{
@@ -274,4 +274,4 @@
} // namespace QTerm
-#include <keydialog.moc>
+#include <moc_keydialog.cpp>
Modified: trunk/qterm/src/keydialog.h
===================================================================
--- trunk/qterm/src/keydialog.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/keydialog.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -20,7 +20,7 @@
Q_OBJECT
public:
- keyDialog( QWidget* parent = 0, Qt::WFlags fl = 0 );
+ keyDialog( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
~keyDialog();
protected:
Modified: trunk/qterm/src/msgdialog.cpp
===================================================================
--- trunk/qterm/src/msgdialog.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/msgdialog.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -10,7 +10,7 @@
#include <stdio.h>
namespace QTerm
{
-msgDialog::msgDialog( QWidget* parent, Qt::WFlags fl )
+msgDialog::msgDialog( QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl )
{
ui.setupUi(this);
@@ -28,4 +28,4 @@
} // namespace QTerm
-#include <msgdialog.moc>
+#include <moc_msgdialog.cpp>
Modified: trunk/qterm/src/msgdialog.h
===================================================================
--- trunk/qterm/src/msgdialog.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/msgdialog.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -17,7 +17,7 @@
Q_OBJECT
public:
- msgDialog( QWidget* parent = 0, Qt::WFlags fl = 0 );
+ msgDialog( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
~msgDialog();
Ui::msgDialog ui;
Modified: trunk/qterm/src/osdmessage.cpp
===================================================================
--- trunk/qterm/src/osdmessage.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/osdmessage.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -176,4 +176,4 @@
} // namespace QTerm
//#include "osdmessage.moc"
-#include <osdmessage.moc>
+#include <moc_osdmessage.cpp>
Modified: trunk/qterm/src/overlayWidget.cpp
===================================================================
--- trunk/qterm/src/overlayWidget.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/overlayWidget.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -92,3 +92,4 @@
}
}
+#include <moc_overlayWidget.cpp>
Modified: trunk/qterm/src/pallete.cpp
===================================================================
--- trunk/qterm/src/pallete.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/pallete.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -6,7 +6,7 @@
namespace QTerm
{
-Pallete::Pallete( QWidget* parent, Qt::WFlags fl )
+Pallete::Pallete( QWidget* parent, Qt::WindowFlags fl )
: QWidget( parent, fl )
{
setupUi(this);
@@ -51,4 +51,4 @@
}
}
-#include <pallete.moc>
\ No newline at end of file
+#include <moc_pallete.cpp>
Modified: trunk/qterm/src/pallete.h
===================================================================
--- trunk/qterm/src/pallete.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/pallete.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -11,7 +11,7 @@
signals:
void colorChanged(int index, int role);
public:
- Pallete( QWidget* parent = 0, Qt::WFlags fl = 0 );
+ Pallete( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
protected:
bool eventFilter(QObject *obj, QEvent *e);
Modified: trunk/qterm/src/po/CMakeLists.txt
===================================================================
--- trunk/qterm/src/po/CMakeLists.txt 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/po/CMakeLists.txt 2013-06-13 14:54:57 UTC (rev 1322)
@@ -1,5 +1,9 @@
file(GLOB TRANSLATIONS_FILES *.ts)
-qt4_add_translation(QM_FILES ${TRANSLATIONS_FILES})
+if(QT5)
+ qt5_add_translation(QM_FILES ${TRANSLATIONS_FILES})
+else(QT5)
+ qt4_add_translation(QM_FILES ${TRANSLATIONS_FILES})
+endif(QT5)
add_custom_target(translations_target DEPENDS ${QM_FILES})
if (NOT APPLE)
install(FILES ${QM_FILES} DESTINATION share/qterm/po)
Modified: trunk/qterm/src/popupMessage.cpp
===================================================================
--- trunk/qterm/src/popupMessage.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/popupMessage.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -124,14 +124,14 @@
void PopupMessage::showCloseButton( const bool show )
{
- findChild<QPushButton *>( "closeButton" )->setShown( show );
+ findChild<QPushButton *>( "closeButton" )->setVisible( show );
adjustSize();
}
void PopupMessage::showCounter( const bool show )
{
m_showCounter = show;
- findChild<QFrame*>( "counterVisual" )->setShown( show );
+ findChild<QFrame*>( "counterVisual" )->setVisible( show );
adjustSize();
}
@@ -353,4 +353,4 @@
}
//#include "popupMessage.moc"
-#include <popupMessage.moc>
+#include <moc_popupMessage.cpp>
Modified: trunk/qterm/src/popwidget.cpp
===================================================================
--- trunk/qterm/src/popwidget.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/popwidget.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -153,4 +153,4 @@
}
-#include <popwidget.moc>
+#include <moc_popwidget.cpp>
Modified: trunk/qterm/src/prefdialog.cpp
===================================================================
--- trunk/qterm/src/prefdialog.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/prefdialog.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -27,7 +27,7 @@
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
-prefDialog::prefDialog( QWidget* parent, Qt::WFlags fl )
+prefDialog::prefDialog( QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl )
{
@@ -243,4 +243,4 @@
} // namespace QTerm
-#include <prefdialog.moc>
+#include <moc_prefdialog.cpp>
Modified: trunk/qterm/src/prefdialog.h
===================================================================
--- trunk/qterm/src/prefdialog.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/prefdialog.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -20,7 +20,7 @@
Q_OBJECT
public:
- prefDialog( QWidget* parent = 0, Qt::WFlags fl = 0 );
+ prefDialog( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
~prefDialog();
protected slots:
Modified: trunk/qterm/src/progressBar.cpp
===================================================================
--- trunk/qterm/src/progressBar.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/progressBar.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -21,9 +21,15 @@
#include "qtermglobal.h"
//Added by qt3to4:
#include <QtGui/QPixmap>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QProgressBar>
+#include <QtWidgets/QPushButton>
+#else
#include <QtGui/QLabel>
#include <QtGui/QProgressBar>
#include <QtGui/QPushButton>
+#endif
namespace QTerm {
Modified: trunk/qterm/src/qtermbuffer.cpp
===================================================================
--- trunk/qterm/src/qtermbuffer.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermbuffer.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -655,4 +655,4 @@
} // namespace QTerm
-#include <qtermbuffer.moc>
+#include <moc_qtermbuffer.cpp>
Modified: trunk/qterm/src/qtermcanvas.cpp
===================================================================
--- trunk/qterm/src/qtermcanvas.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermcanvas.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -17,7 +17,7 @@
{
// extern QString getSaveFileName(const QString&, QWidget*);
-Canvas::Canvas(QWidget *parent, Qt::WFlags f)
+Canvas::Canvas(QWidget *parent, Qt::WindowFlags f)
: QScrollArea(parent)
{
@@ -341,4 +341,4 @@
} // namespace QTerm
-#include <qtermcanvas.moc>
+#include <moc_qtermcanvas.cpp>
Modified: trunk/qterm/src/qtermcanvas.h
===================================================================
--- trunk/qterm/src/qtermcanvas.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermcanvas.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -21,7 +21,7 @@
{
Q_OBJECT
public:
- Canvas(QWidget *parent = NULL, Qt::WFlags f = 0);
+ Canvas(QWidget *parent = NULL, Qt::WindowFlags f = 0);
~Canvas();
void loadImage(QString);
Modified: trunk/qterm/src/qtermconfig.cpp
===================================================================
--- trunk/qterm/src/qtermconfig.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermconfig.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -15,7 +15,11 @@
#include <QtCore/QFileInfo>
#include <QtCore/QStringList>
#include <QtCore/QString>
+#if QT_VERSION > 0x050000
+#include <QtWidgets/QMessageBox>
+#else
#include <QtGui/QMessageBox>
+#endif
#include <QtDebug>
namespace QTerm
Modified: trunk/qterm/src/qtermdecode.cpp
===================================================================
--- trunk/qterm/src/qtermdecode.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermdecode.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -620,4 +620,4 @@
} // namespace QTerm
-#include <qtermdecode.moc>
+#include <moc_qtermdecode.cpp>
Modified: trunk/qterm/src/qtermframe.cpp
===================================================================
--- trunk/qterm/src/qtermframe.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermframe.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -71,9 +71,13 @@
#include <QLineEdit>
#include <QInputDialog>
#include <QStatusBar>
+#if QT_VERSION >= 0x050000
+#include <QtPrintSupport/QPrinter>
+#include <QtPrintSupport/QPrintDialog>
+#else
#include <QtGui/QPrinter>
#include <QtGui/QPrintDialog>
-#include <QtGui/QPainter>
+#endif
#include <QtDebug>
#include <QUuid>
@@ -1242,4 +1246,4 @@
}
-#include <qtermframe.moc>
+#include <moc_qtermframe.cpp>
Modified: trunk/qterm/src/qtermglobal.cpp
===================================================================
--- trunk/qterm/src/qtermglobal.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermglobal.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -25,13 +25,19 @@
#include <QtCore/QUrl>
#include <QtCore/QProcess>
#include <QtCore/QLibraryInfo>
+#include <QtCore/QUuid>
+#include <QtCore/QTextStream>
+#include <QtGui/QDesktopServices>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMessageBox>
+#else
#include <QtGui/QApplication>
-#include <QtGui/QDesktopServices>
#include <QtGui/QFileDialog>
#include <QtGui/QMessageBox>
+#endif
#include <QtXml/QDomDocument>
-#include <QtCore/QUuid>
-#include <QtCore/QTextStream>
#if defined(_OS_WIN32_) || defined(Q_OS_WIN32)
#include <windows.h>
@@ -842,4 +848,4 @@
} // namespace QTerm
-#include <qtermglobal.moc>
+#include <moc_qtermglobal.cpp>
Modified: trunk/qterm/src/qtermhttp.cpp
===================================================================
--- trunk/qterm/src/qtermhttp.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermhttp.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -12,9 +12,12 @@
#include <QtCore/QRegExp>
#include <QtCore/QProcess>
#include <QtCore/QTextCodec>
+#include <QtCore/QDebug>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets/QMessageBox>
+#else
#include <QtGui/QMessageBox>
-#include <QtCore/QDebug>
-
+#endif
namespace QTerm
{
@@ -23,11 +26,7 @@
{
m_codec = codec;
m_pCanvas = NULL;
- connect(&m_httpDown, SIGNAL(done(bool)), this, SLOT(httpDone(bool)));
- connect(&m_httpDown, SIGNAL(dataReadProgress(int, int)),
- this, SLOT(httpRead(int, int)));
- connect(&m_httpDown, SIGNAL(responseHeaderReceived(const QHttpResponseHeader&)),
- this, SLOT(httpResponse(const QHttpResponseHeader&)));
+ m_httpReply = NULL;
}
Http::~Http()
@@ -36,7 +35,8 @@
void Http::cancel()
{
- m_httpDown.abort();
+ if (m_httpReply)
+ m_httpReply->abort();
// remove unsuccessful download
if (QFile::exists(m_strHttpFile))
@@ -50,17 +50,15 @@
m_bExist = false;
m_bPreview = preview;
QUrl u(url);
+ m_url = u;
+ // local files need no network
if (u.isRelative() || u.scheme() == "file") {
previewImage(u.path());
emit done(this);
return;
}
-// QString path = url.mid(url.find(u.host(),false) + u.host().length());
-// QString path = url.mid(url.find('/',
-// url.find(u.host(),false),
-// false));
-
+ // alternative host substitute
if (QFile::exists(Global::instance()->pathCfg() + "hosts.cfg")) {
Config conf(Global::instance()->pathCfg() + "hosts.cfg");
QString strTmp = conf.getItemValue("hosts", u.host()).toString();
@@ -71,47 +69,25 @@
}
}
m_strHttpFile = QFileInfo(u.path()).fileName();
- m_httpDown.setHost(u.host(), u.port(80));
- m_httpDown.get(u.path() + "?" + u.encodedQuery());
+ m_httpReply = m_httpDown.get(QNetworkRequest(u));
+
+ connect(m_httpReply, SIGNAL(finished()), this, SLOT(httpDone()));
+ connect(m_httpReply, SIGNAL(dataReadProgress(qint64, qint64)),
+ this, SLOT(httpRead(qint64, qint64)));
+ connect(m_httpReply, SIGNAL(metaDataChanged()),
+ this, SLOT(httpHeader()));
}
-void Http::httpResponse(const QHttpResponseHeader& hrh)
+void Http::httpHeader()
{
- int code = hrh.statusCode();
-
- if (code >=300 && code < 400 && hrh.hasKey("Location")) {
- if(hrh.value("Location") != m_httpDown.currentRequest().path()) {
- qDebug() << "http redicrection: " << hrh.value("Location");
- QUrl u(hrh.value("Location"));
- m_httpDown.setHost(u.host(), u.port(80));
- m_httpDown.get(u.path() + "?" + u.encodedQuery());
- return;
- }
- }
-
- if (code != 200) {
- m_httpDown.abort();
+ if (m_httpReply->error() != QNetworkReply::NoError)
return;
- }
- QString ValueString;
- QString filename;
+ QVariant value;
- ValueString = hrh.value("Content-Length");
- int FileLength = ValueString.toInt();
+ int FileLength = m_httpReply->header(QNetworkRequest::ContentLengthHeader).toInt();
- ValueString = hrh.value("Content-Disposition");
-// ValueString = ValueString.mid(ValueString.find(';') + 1).stripWhiteSpace();
-// if(ValueString.lower().find("filename") == 0)
-// m_strHttpFile = ValueString.mid(ValueString.find('=') + 1).stripWhiteSpace();
- if (ValueString.right(1) != ";")
- ValueString += ";";
- QRegExp re("filename=.*;", Qt::CaseInsensitive);
- re.setMinimal(true); //Dont FIXME:this will also split filenames with ';' inside, does anyone really do this?
- int pos = re.indexIn(ValueString);
- if (pos != -1)
- m_strHttpFile = ValueString.mid(pos + 9, re.matchedLength() - 10);
- filename = m_strHttpFile = m_codec->toUnicode(m_strHttpFile.toLatin1());
+ m_strHttpFile = m_httpReply->header(QNetworkRequest::ContentDispositionHeader).toString();
if (m_bPreview) {
QString strPool = Global::instance()->m_pref.strPoolPath;
@@ -120,13 +96,14 @@
QFileInfo fi(m_strHttpFile);
+ // append .n if local file exists
int i = 1;
QFileInfo fi2 = fi;
while (fi2.exists()) {
// all the same
if (fi2.size() == FileLength) {
m_bExist = true;
- m_httpDown.abort();
+ m_httpReply->abort();
break;
} else {
m_strHttpFile = QString("%1/%2(%3).%4")
@@ -150,14 +127,14 @@
QString strSave = Global::instance()->getSaveFileName(m_strHttpFile, NULL);
// no filename specified which means the user canceled this download
if (strSave.isEmpty()) {
- m_httpDown.abort();
+ m_httpReply->abort();
emit done(this);
return;
}
m_strHttpFile = strSave;
}
QTerm::StatusBar::instance()->newProgressOperation(this)
- .setDescription(filename)
+ .setDescription(m_strHttpFile)
.setAbortSlot(this, SLOT(cancel()))
.setMaximum(100);
QTerm::StatusBar::instance()->resetMainText();
@@ -166,9 +143,9 @@
}
-void Http::httpRead(int done, int total)
+void Http::httpRead(qint64 done, qint64 total)
{
- QByteArray ba = m_httpDown.readAll();
+ QByteArray ba = m_httpReply->readAll();
QFile file(m_strHttpFile);
if (file.open(QIODevice::ReadWrite | QIODevice::Append)) {
QDataStream ds(&file);
@@ -180,25 +157,32 @@
emit percent(done*100 / total);
}
-void Http::httpDone(bool err)
+void Http::httpDone()
{
- if (err) {
- switch (m_httpDown.error()) {
- case QHttp::Aborted:
- if (m_bExist)
- break;
- else {
- emit done(this);
- return;
- }
- default:
- QMessageBox::critical(NULL, tr("Download Error"),
- tr("Failed to download file"));
- deleteLater();
+ switch (m_httpReply->error()) {
+ case QNetworkReply::NoError:
+ break;
+ case QNetworkReply::OperationCanceledError:
+ if (m_bExist)
+ break;
+ else {
+ emit done(this);
return;
}
+ default:
+ QMessageBox::critical(NULL, tr("Download Error"),
+ tr("Failed to download file"));
+ deleteLater();
+ return;
}
-
+ // we are redirected
+ QVariant redirectionTarget = m_httpReply->attribute(QNetworkRequest::RedirectionTargetAttribute);
+ if (!redirectionTarget.isNull()) {
+ m_url = m_url.resolved(redirectionTarget.toUrl());
+ m_httpReply->deleteLater();
+ getLink(m_url.toString(), m_bPreview);
+ return;
+ }
if (m_bPreview) {
QString strPool = Global::instance()->m_pref.strPoolPath;
previewImage(m_strHttpFile);
@@ -225,4 +209,4 @@
} // namespace QTerm
-#include <qtermhttp.moc>
+#include <moc_qtermhttp.cpp>
Modified: trunk/qterm/src/qtermhttp.h
===================================================================
--- trunk/qterm/src/qtermhttp.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermhttp.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -2,7 +2,8 @@
#define QTERMHTTP_H
#include <QtCore/QObject>
-#include <QtNetwork/QHttp>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
class QWidget;
class QTextCodec;
@@ -21,9 +22,9 @@
void getLink(const QString&, bool);
protected slots:
void cancel();
- void httpDone(bool);
- void httpRead(int, int);
- void httpResponse(const QHttpResponseHeader &);
+ void httpDone();
+ void httpRead(qint64 bytesRead, qint64 totlaBytes);
+ void httpHeader();
void previewImage(const QString&);
signals:
@@ -32,7 +33,9 @@
void percent(int);
protected:
- QHttp m_httpDown;
+ QNetworkAccessManager m_httpDown;
+ QNetworkReply *m_httpReply;
+ QUrl m_url;
QString m_strHttpFile;
bool m_bPreview;
bool m_bExist;
Modified: trunk/qterm/src/qtermiplocation.cpp
===================================================================
--- trunk/qterm/src/qtermiplocation.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermiplocation.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -174,7 +174,7 @@
f->offset_last_start_ip = byteArrayToInt((char *)buf, 4);
record_count = (f->offset_last_start_ip - f->offset_first_start_ip) / 7;
- if (record_count <= 1) return FALSE;
+ if (record_count <= 1) return false;
// search for right range
B = 0; E = record_count;
@@ -197,6 +197,6 @@
} else {// not in this range... miss
country = "unkown"; city = "";
}// if ip_start<=ip<=ip_end
- return TRUE;
+ return true;
}
}
Modified: trunk/qterm/src/qtermscreen.cpp
===================================================================
--- trunk/qterm/src/qtermscreen.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermscreen.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -1199,7 +1199,7 @@
if (img.depth() <= 8) {
// pseudo color
- for (int i = 0; i < img.numColors(); i++) {
+ for (int i = 0; i < img.colorCount(); i++) {
col = img.color(i);
cr = qRed(col); cg = qGreen(col); cb = qBlue(col);
if (cr > red)
@@ -1361,4 +1361,4 @@
} // namespace QTerm
-#include <qtermscreen.moc>
+#include <moc_qtermscreen.cpp>
Modified: trunk/qterm/src/qtermsocket.cpp
===================================================================
--- trunk/qterm/src/qtermsocket.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermsocket.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -609,5 +609,5 @@
} // namespace QTerm
-#include <qtermsocket.moc>
+#include <moc_qtermsocket.cpp>
Modified: trunk/qterm/src/qtermsound.cpp
===================================================================
--- trunk/qterm/src/qtermsound.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermsound.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -1,7 +1,6 @@
#include "qtermsound.h"
#include <QtCore/QFile>
#include <QtCore/QProcess>
-#include <QtGui/QMessageBox>
#ifdef PHONON_ENABLED
#ifdef OLD_PHONON
Modified: trunk/qterm/src/qtermtelnet.cpp
===================================================================
--- trunk/qterm/src/qtermtelnet.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermtelnet.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -903,4 +903,4 @@
} // namespace QTerm
-#include <qtermtelnet.moc>
+#include <moc_qtermtelnet.cpp>
Modified: trunk/qterm/src/qtermtextline.cpp
===================================================================
--- trunk/qterm/src/qtermtextline.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermtextline.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -369,4 +369,4 @@
}
} // namespace QTerm
-#include <qtermtextline.moc>
+#include <moc_qtermtextline.cpp>
Modified: trunk/qterm/src/qtermtimelabel.cpp
===================================================================
--- trunk/qterm/src/qtermtimelabel.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermtimelabel.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -19,7 +19,7 @@
#include <QDateTime>
//constructor
-QTermTimeLabel::QTermTimeLabel(QWidget * parent, const char * name, Qt::WFlags f)
+QTermTimeLabel::QTermTimeLabel(QWidget * parent, const char * name, Qt::WindowFlags f)
:QLabel(parent,f)
{
setAlignment(Qt::AlignHCenter);
@@ -37,4 +37,4 @@
{
setText(currentTime->currentTime().toString());
}
-#include <qtermtimelabel.moc>
+#include <moc_qtermtimelabel.cpp>
Modified: trunk/qterm/src/qtermtimelabel.h
===================================================================
--- trunk/qterm/src/qtermtimelabel.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermtimelabel.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -11,7 +11,7 @@
{
Q_OBJECT
public:
- QTermTimeLabel(QWidget * parent, const char * name=0, Qt::WFlags f=0);
+ QTermTimeLabel(QWidget * parent, const char * name=0, Qt::WindowFlags f=0);
~QTermTimeLabel();
protected:
QTime * currentTime;
Modified: trunk/qterm/src/qtermtoolbutton.cpp
===================================================================
--- trunk/qterm/src/qtermtoolbutton.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermtoolbutton.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -31,4 +31,4 @@
} // namespace QTerm
-#include <qtermtoolbutton.moc>
+#include <moc_qtermtoolbutton.cpp>
Modified: trunk/qterm/src/qtermwindow.cpp
===================================================================
--- trunk/qterm/src/qtermwindow.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermwindow.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -238,7 +238,7 @@
};
//constructor
-Window::Window(Frame * frame, Param param, const QString &uuid, QWidget * parent, const char * name, Qt::WFlags wflags)
+Window::Window(Frame * frame, Param param, const QString &uuid, QWidget * parent, const char * name, Qt::WindowFlags wflags)
: WindowBase(parent, wflags), m_strMessage(), location()
{
groupActions();
@@ -1899,4 +1899,4 @@
}
}
-#include <qtermwindow.moc>
+#include <moc_qtermwindow.cpp>
Modified: trunk/qterm/src/qtermwindow.h
===================================================================
--- trunk/qterm/src/qtermwindow.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermwindow.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -76,7 +76,7 @@
Q_OBJECT
public:
Window(Frame * frame, Param param, const QString& uuid, QWidget* parent = 0,
- const char* name = 0, Qt::WFlags wflags = Qt::Window);
+ const char* name = 0, Qt::WindowFlags wflags = Qt::Window);
~Window();
void connectHost();
Modified: trunk/qterm/src/qtermwindowbase.cpp
===================================================================
--- trunk/qterm/src/qtermwindowbase.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermwindowbase.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -1,3 +1,3 @@
#include "qtermwindowbase.h"
-#include "qtermwindowbase.moc"
+#include "moc_qtermwindowbase.cpp"
Modified: trunk/qterm/src/qtermzmodem.cpp
===================================================================
--- trunk/qterm/src/qtermzmodem.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/qtermzmodem.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -8,7 +8,11 @@
#include <QtCore/QString>
#include <QtCore/QFileInfo>
#include <QtCore/QTextCodec>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets/QFileDialog>
+#else
#include <QtGui/QFileDialog>
+#endif
namespace QTerm
{
@@ -2852,4 +2856,4 @@
} // namespace QTerm
-#include <qtermzmodem.moc>
+#include <moc_qtermzmodem.cpp>
Modified: trunk/qterm/src/quickdialog.cpp
===================================================================
--- trunk/qterm/src/quickdialog.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/quickdialog.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -28,7 +28,7 @@
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
-quickDialog::quickDialog(QWidget* parent, Qt::WFlags fl)
+quickDialog::quickDialog(QWidget* parent, Qt::WindowFlags fl)
: QDialog(parent, fl)
{
ui.setupUi(this);
@@ -254,4 +254,4 @@
} // namespace QTerm
-#include <quickdialog.moc>
+#include <moc_quickdialog.cpp>
Modified: trunk/qterm/src/quickdialog.h
===================================================================
--- trunk/qterm/src/quickdialog.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/quickdialog.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -25,7 +25,7 @@
Q_OBJECT
public:
- quickDialog(QWidget* parent = 0, Qt::WFlags fl = 0);
+ quickDialog(QWidget* parent = 0, Qt::WindowFlags fl = 0);
~quickDialog();
Param param;
Modified: trunk/qterm/src/schemedialog.cpp
===================================================================
--- trunk/qterm/src/schemedialog.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/schemedialog.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -10,7 +10,7 @@
namespace QTerm
{
-schemeDialog::schemeDialog(QWidget* parent, Qt::WFlags fl)
+schemeDialog::schemeDialog(QWidget* parent, Qt::WindowFlags fl)
: QDialog(parent, fl)
{
ui.setupUi(this);
@@ -311,4 +311,4 @@
} // namespace QTerm
-#include <schemedialog.moc>
+#include <moc_schemedialog.cpp>
Modified: trunk/qterm/src/schemedialog.h
===================================================================
--- trunk/qterm/src/schemedialog.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/schemedialog.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -9,7 +9,7 @@
Q_OBJECT
public:
- schemeDialog(QWidget* parent = 0, Qt::WFlags fl = 0);
+ schemeDialog(QWidget* parent = 0, Qt::WindowFlags fl = 0);
~schemeDialog();
void setScheme(const QString&);
Modified: trunk/qterm/src/scripthelper.cpp
===================================================================
--- trunk/qterm/src/scripthelper.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/scripthelper.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -308,4 +308,4 @@
} // namespace QTerm
-#include <scripthelper.moc>
+#include <moc_scripthelper.cpp>
Modified: trunk/qterm/src/shortcutsdialog.cpp
===================================================================
--- trunk/qterm/src/shortcutsdialog.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/shortcutsdialog.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -1,8 +1,12 @@
#include "shortcutsdialog.h"
-
#include <QtGui/QKeyEvent>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QShortcut>
+#else
#include <QtGui/QMessageBox>
#include <QtGui/QShortcut>
+#endif
namespace QTerm {
@@ -180,4 +184,4 @@
}
-#include <shortcutsdialog.moc>
+#include <moc_shortcutsdialog.cpp>
Modified: trunk/qterm/src/shortcutsdialog.h
===================================================================
--- trunk/qterm/src/shortcutsdialog.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/shortcutsdialog.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -2,7 +2,7 @@
#define SHORTCUTSDIALOG_H
#include "ui_shortcutsdialog.h"
-#include <QtGui/QShortcut>
+class QShortcut;
namespace QTerm{
Modified: trunk/qterm/src/soundconf.cpp
===================================================================
--- trunk/qterm/src/soundconf.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/soundconf.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -17,7 +17,7 @@
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
-soundConf::soundConf( QWidget* parent, Qt::WFlags fl )
+soundConf::soundConf( QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl ),bgMethod(this)
{
ui.setupUi(this);
@@ -187,4 +187,4 @@
} // namespace QTerm
-#include <soundconf.moc>
+#include <moc_soundconf.cpp>
Modified: trunk/qterm/src/soundconf.h
===================================================================
--- trunk/qterm/src/soundconf.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/soundconf.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -11,7 +11,7 @@
Q_OBJECT
public:
- soundConf( QWidget* parent = 0, Qt::WFlags fl = 0 );
+ soundConf( QWidget* parent = 0, Qt::WindowFlags fl = 0 );
~soundConf();
void loadSetting();
void saveSetting();
Modified: trunk/qterm/src/ssh/auth.cpp
===================================================================
--- trunk/qterm/src/ssh/auth.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/ssh/auth.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -19,7 +19,6 @@
#include <QtCore/QCryptographicHash>
#include <QtCore/QDir>
#include <QtCore/QFile>
-#include <QtGui/QInputDialog>
#ifdef SSH_DEBUG
#include <QtDebug>
@@ -450,5 +449,5 @@
}
-#include "auth.moc"
+#include "moc_auth.cpp"
Modified: trunk/qterm/src/ssh/channel.cpp
===================================================================
--- trunk/qterm/src/ssh/channel.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/ssh/channel.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -319,5 +319,5 @@
}
-#include "channel.moc"
+#include "moc_channel.cpp"
Modified: trunk/qterm/src/ssh/kex.cpp
===================================================================
--- trunk/qterm/src/ssh/kex.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/ssh/kex.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -559,5 +559,5 @@
}
-#include "kex.moc"
+#include "moc_kex.cpp"
Modified: trunk/qterm/src/ssh/packet.cpp
===================================================================
--- trunk/qterm/src/ssh/packet.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/ssh/packet.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -634,5 +634,5 @@
}
-#include "packet.moc"
+#include "moc_packet.cpp"
Modified: trunk/qterm/src/ssh/socket.cpp
===================================================================
--- trunk/qterm/src/ssh/socket.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/ssh/socket.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -322,5 +322,5 @@
}
-#include "socket.moc"
+#include "moc_socket.cpp"
Modified: trunk/qterm/src/statusBar.cpp
===================================================================
--- trunk/qterm/src/statusBar.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/statusBar.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -23,7 +23,6 @@
#include <QEvent>
// #include <Q3Frame>
#include <QHBoxLayout>
-#include <QCustomEvent>
#include <QProgressBar>
#include <QToolButton>
#include <QPushButton>
@@ -405,7 +404,7 @@
StatusBar::toggleProgressWindow( bool show ) //slot
{
m_popupProgress->adjustSize(); //FIXME shouldn't be needed, adding bars doesn't seem to do this
- m_popupProgress->setShown( show );
+ m_popupProgress->setVisible( show );
if( !show )
hideMainProgressBar();
@@ -504,7 +503,7 @@
void
StatusBar::updateProgressAppearance()
{
- toggleProgressWindowButton()->setShown( m_progressMap.count() > 1 );
+ toggleProgressWindowButton()->setVisible( m_progressMap.count() > 1 );
resetMainText();
@@ -537,7 +536,7 @@
{
resetMainText();
(progressBox()->findChild<QWidget*>("showAllProgressDetails"))->hide();
- m_popupProgress->setShown(false);
+ m_popupProgress->setVisible(false);
}
}
@@ -545,4 +544,4 @@
//#include "statusBar.moc"
-#include <statusBar.moc>
+#include <moc_statusBar.cpp>
Modified: trunk/qterm/src/statusBar.h
===================================================================
--- trunk/qterm/src/statusBar.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/statusBar.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -6,7 +6,6 @@
// #include <qmap.h> //stack allocated
// #include <q3valuelist.h> //stack allocated
//Added by qt3to4:
-// #include <QCustomEvent>
#include <QLabel>
#include <QEvent>
#include <QPaintEvent>
@@ -82,7 +81,6 @@
protected:
virtual void ensurePolished();
-// virtual void customEvent( QCustomEvent* );
virtual void paintEvent( QPaintEvent* );
virtual bool event( QEvent* );
Modified: trunk/qterm/src/toolbardialog.cpp
===================================================================
--- trunk/qterm/src/toolbardialog.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/toolbardialog.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -1,10 +1,17 @@
#include "toolbardialog.h"
-#include <QtGui/QToolBar>
#include <QtCore/QRegExp>
#include <QtCore/QSettings>
+
+#if QT_VERSION >= 0x050000
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QToolButton>
+#else
+#include <QtGui/QToolBar>
#include <QtGui/QMainWindow>
#include <QtGui/QToolButton>
+#endif
ToolbarDialog::ToolbarDialog(QWidget* parent)
: QDialog(parent),m_defaultToolBars()
@@ -248,4 +255,4 @@
comboToolbarsCurrentIndexChanged(comboToolbars->currentIndex());
}
-#include <toolbardialog.moc>
+#include <moc_toolbardialog.cpp>
Modified: trunk/qterm/src/wallet.cpp
===================================================================
--- trunk/qterm/src/wallet.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/wallet.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -123,4 +123,4 @@
}
-#include <wallet.moc>
+#include <moc_wallet.cpp>
Modified: trunk/qterm/src/zmodemdialog.cpp
===================================================================
--- trunk/qterm/src/zmodemdialog.cpp 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/zmodemdialog.cpp 2013-06-13 14:54:57 UTC (rev 1322)
@@ -3,7 +3,7 @@
#include <QMessageBox>
namespace QTerm
{
-zmodemDialog::zmodemDialog(QWidget *parent, Qt::WFlags fl)
+zmodemDialog::zmodemDialog(QWidget *parent, Qt::WindowFlags fl)
: QDialog(parent, fl)
{
ui.setupUi(this);
@@ -58,5 +58,5 @@
} // namespace QTerm
-#include <zmodemdialog.moc>
+#include <moc_zmodemdialog.cpp>
Modified: trunk/qterm/src/zmodemdialog.h
===================================================================
--- trunk/qterm/src/zmodemdialog.h 2013-06-13 14:30:07 UTC (rev 1321)
+++ trunk/qterm/src/zmodemdialog.h 2013-06-13 14:54:57 UTC (rev 1322)
@@ -10,7 +10,7 @@
Q_OBJECT
public:
- zmodemDialog( QWidget *parent=0, Qt::WFlags fl=0 );
+ zmodemDialog( QWidget *parent=0, Qt::WindowFlags fl=0 );
~zmodemDialog();
void setFileInfo(const QString&, int);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
