diff -ur arc-gui-clients-0.4.6-Source.orig/CMakeLists.txt arc-gui-clients-0.4.6-Source/CMakeLists.txt
--- arc-gui-clients-0.4.6-Source.orig/CMakeLists.txt 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/CMakeLists.txt 2017-10-11 14:00:57.144762331 +0200
@@ -15,7 +15,7 @@
find_package(OpenSSL REQUIRED)
set(QT_MAKE_EXECUTABLE "/opt/local/bin/qmake")
-find_package(Qt4 COMPONENTS QtMain QtCore QtGui QtSql QtXml QtNetwork QtWebKit REQUIRED)
+find_package(Qt5 COMPONENTS Core Widgets WebKitWidgets Concurrent REQUIRED)
find_package(Glib REQUIRED)
find_package(LibXml2 REQUIRED)
find_package(Glibmm REQUIRED)
@@ -25,8 +25,6 @@
configure_file(${CMAKE_SOURCE_DIR}/src/common/arc-gui-config.h.in ${CMAKE_SOURCE_DIR}/src/common/arc-gui-config.h)
-include(${QT_USE_FILE})
-
subdirs(src)
set(CPACK_GENERATOR "TGZ;RPM")
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arccert-ui/certconvertwindow.cpp arc-gui-clients-0.4.6-Source/src/arccert-ui/certconvertwindow.cpp
--- arc-gui-clients-0.4.6-Source.orig/src/arccert-ui/certconvertwindow.cpp 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arccert-ui/certconvertwindow.cpp 2017-10-11 13:11:36.677272765 +0200
@@ -129,8 +129,8 @@
// Send passphrases as standard input
- p.write(m_passin.toAscii());
- p.write(m_passout.toAscii());
+ p.write(m_passin.toLatin1());
+ p.write(m_passout.toLatin1());
p.waitForFinished();
// Process output
@@ -295,8 +295,8 @@
// Send passphrases as standard input
- p1.write(m_passin.toAscii());
- p1.write(m_passout.toAscii());
+ p1.write(m_passin.toLatin1());
+ p1.write(m_passout.toLatin1());
p1.waitForFinished(-1);
// Process output
@@ -323,7 +323,7 @@
// Send passphrases as standard input
- p2.write(m_passin.toAscii());
+ p2.write(m_passin.toLatin1());
p2.waitForFinished(-1);
// Process output
@@ -351,6 +351,6 @@
// Change permissions
qDebug() << "chmod 400 '" + keyFilename + "'";
- chmod(keyFilename.toAscii(), 0400);
+ chmod(keyFilename.toLatin1(), 0400);
}
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arccert-ui/CMakeLists.txt arc-gui-clients-0.4.6-Source/src/arccert-ui/CMakeLists.txt
--- arc-gui-clients-0.4.6-Source.orig/src/arccert-ui/CMakeLists.txt 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arccert-ui/CMakeLists.txt 2017-10-11 14:06:22.785185191 +0200
@@ -1,7 +1,5 @@
add_definitions(-DQT_NO_KEYWORDS)
-include(${QT_USE_FILE})
-
SET(arccertui_UIS
certconvertwindow.ui
)
@@ -20,9 +18,9 @@
#)
# After this call, foo_MOC_SRCS = moc_Class1.cxx moc_Class2.cxx moc_Class3.cxx.
-QT4_WRAP_CPP(arccertui_MOC_SRCS ${arccertui_MOC_HDRS} )
-QT4_WRAP_UI(arccertui_UIS_H ${arccertui_UIS} )
-QT4_ADD_RESOURCES( arccertui_RC_SRCS ${arccertui_RCS} )
+QT5_WRAP_CPP(arccertui_MOC_SRCS ${arccertui_MOC_HDRS} )
+QT5_WRAP_UI(arccertui_UIS_H ${arccertui_UIS} )
+QT5_ADD_RESOURCES( arccertui_RC_SRCS ${arccertui_RCS} )
IF(APPLE)
ADD_EXECUTABLE(
@@ -55,6 +53,8 @@
)
ENDIF(APPLE)
+QT5_USE_MODULES(arccert-ui Core Widgets)
+
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/src/common ${Arc_INCLUDE_DIRS} ${GlibmmConfig_INCLUDE_DIR} ${Glibmm_INCLUDE_DIR} ${GlibConfig_INCLUDE_DIR} ${Glib_INCLUDE_DIR} ${SigC++Config_INCLUDE_DIR} ${SigC++_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR})
target_link_libraries (arccert-ui ${Arc_LIBRARIES} ${Glibmm_LIBRARY} ${Glib_LIBRARIES} ${SigC++_LIBRARIES} ${LIBXML2_LIBRARIES} ${QT_LIBRARIES} ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES})
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arccert-ui/main.cpp arc-gui-clients-0.4.6-Source/src/arccert-ui/main.cpp
--- arc-gui-clients-0.4.6-Source.orig/src/arccert-ui/main.cpp 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arccert-ui/main.cpp 2017-10-11 14:30:27.608296547 +0200
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
#include "certconvertwindow.h"
int main(int argc, char *argv[])
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arccert-ui/qdebugstream.h arc-gui-clients-0.4.6-Source/src/arccert-ui/qdebugstream.h
--- arc-gui-clients-0.4.6-Source.orig/src/arccert-ui/qdebugstream.h 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arccert-ui/qdebugstream.h 2017-09-28 21:34:28.441501209 +0200
@@ -16,7 +16,7 @@
#include "qtextedit.h"
-#include <QCustomEvent>
+#include <QEvent>
// Define your custom event identifier
const QEvent::Type DEBUG_STREAM_EVENT = static_cast<QEvent::Type>(QEvent::User + 1);
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcproxy-ui/CMakeLists.txt arc-gui-clients-0.4.6-Source/src/arcproxy-ui/CMakeLists.txt
--- arc-gui-clients-0.4.6-Source.orig/src/arcproxy-ui/CMakeLists.txt 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcproxy-ui/CMakeLists.txt 2017-10-11 14:06:22.784185202 +0200
@@ -1,7 +1,5 @@
add_definitions(-DQT_NO_KEYWORDS)
-include(${QT_USE_FILE})
-
SET(arcproxyui_UIS
../common/proxywindow.ui
../common/infodialog.ui
@@ -32,9 +30,9 @@
)
# After this call, foo_MOC_SRCS = moc_Class1.cxx moc_Class2.cxx moc_Class3.cxx.
-QT4_WRAP_CPP(arcproxyui_MOC_SRCS ${arcproxyui_MOC_HDRS} )
-QT4_WRAP_UI(arcproxyui_UIS_H ${arcproxyui_UIS} )
-QT4_ADD_RESOURCES( arcproxyui_RC_SRCS ${arcproxyui_RCS} )
+QT5_WRAP_CPP(arcproxyui_MOC_SRCS ${arcproxyui_MOC_HDRS} )
+QT5_WRAP_UI(arcproxyui_UIS_H ${arcproxyui_UIS} )
+QT5_ADD_RESOURCES( arcproxyui_RC_SRCS ${arcproxyui_RCS} )
IF(APPLE)
ADD_EXECUTABLE(
@@ -63,6 +61,8 @@
add_executable(arcproxy-ui ${arcproxyui_SRCS} ${arcproxyui_MOC_SRCS} ${arcproxyui_RC_SRCS} ${arcproxyui_UIS_H} )
ENDIF(APPLE)
+QT5_USE_MODULES(arcproxy-ui Core Widgets WebKitWidgets)
+
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/src/common ${Arc_INCLUDE_DIRS} ${GlibmmConfig_INCLUDE_DIR} ${Glibmm_INCLUDE_DIR} ${GlibConfig_INCLUDE_DIR} ${Glib_INCLUDE_DIR} ${SigC++Config_INCLUDE_DIR} ${SigC++_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} ${NSS_INCLUDE_DIR} ${NSPR_INCLUDE_DIR})
target_link_libraries (arcproxy-ui ${Arc_LIBRARIES} ${Glibmm_LIBRARY} ${Glib_LIBRARIES} ${SigC++_LIBRARIES} ${LIBXML2_LIBRARIES} ${QT_LIBRARIES} ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES} ${NSS_LIBRARY} ${NSPR_LIBRARY})
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcstat-ui/arcjobcontroller.cpp arc-gui-clients-0.4.6-Source/src/arcstat-ui/arcjobcontroller.cpp
--- arc-gui-clients-0.4.6-Source.orig/src/arcstat-ui/arcjobcontroller.cpp 2017-10-11 13:50:50.755422885 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcstat-ui/arcjobcontroller.cpp 2017-09-28 21:39:39.928079907 +0200
@@ -94,7 +94,7 @@
QStringList labels;
labels << "JobID" << "Name" << "State";
m_jobTable->setHorizontalHeaderLabels(labels);
- m_jobTable->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
+ m_jobTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
m_jobTable->verticalHeader()->hide();
m_jobTable->setShowGrid(true);
m_jobTable->setFrameStyle(QFrame::NoFrame);
@@ -182,9 +182,9 @@
QStringList labels;
labels << "Job list" << "Size" << "Status (W/R/F/O/U)";
m_jobListTable->setHorizontalHeaderLabels(labels);
- m_jobListTable->horizontalHeader()->setResizeMode(0, QHeaderView::ResizeToContents);
- m_jobListTable->horizontalHeader()->setResizeMode(1, QHeaderView::ResizeToContents);
- m_jobListTable->horizontalHeader()->setResizeMode(2, QHeaderView::Stretch);
+ m_jobListTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+ m_jobListTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
+ m_jobListTable->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Stretch);
m_jobListTable->verticalHeader()->hide();
m_jobListTable->setShowGrid(true);
m_jobListTable->setFrameStyle(QFrame::NoFrame);
@@ -232,7 +232,7 @@
QStringList labels;
labels << "JobID" << "Name" << "State";
m_jobTable->setHorizontalHeaderLabels(labels);
- m_jobTable->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
+ m_jobTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
m_jobTable->verticalHeader()->hide();
m_jobTable->setShowGrid(true);
m_jobTable->setFrameStyle(QFrame::NoFrame);
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcstat-ui/CMakeLists.txt arc-gui-clients-0.4.6-Source/src/arcstat-ui/CMakeLists.txt
--- arc-gui-clients-0.4.6-Source.orig/src/arcstat-ui/CMakeLists.txt 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcstat-ui/CMakeLists.txt 2017-10-11 14:06:22.785185191 +0200
@@ -1,7 +1,5 @@
add_definitions(-DQT_NO_KEYWORDS)
-include(${QT_USE_FILE})
-
SET(arcstatui_UIS
jobstatuswindow.ui
)
@@ -24,9 +22,9 @@
)
# After this call, foo_MOC_SRCS = moc_Class1.cxx moc_Class2.cxx moc_Class3.cxx.
-QT4_WRAP_CPP(arcstatui_MOC_SRCS ${arcstatui_MOC_HDRS} )
-QT4_WRAP_UI(arcstatui_UIS_H ${arcstatui_UIS} )
-QT4_ADD_RESOURCES( arcstatui_RC_SRCS ${arcstatui_RCS} )
+QT5_WRAP_CPP(arcstatui_MOC_SRCS ${arcstatui_MOC_HDRS} )
+QT5_WRAP_UI(arcstatui_UIS_H ${arcstatui_UIS} )
+QT5_ADD_RESOURCES( arcstatui_RC_SRCS ${arcstatui_RCS} )
IF(APPLE)
add_executable(arcstat-ui
@@ -54,6 +52,8 @@
add_executable(arcstat-ui ${arcstatui_SRCS} ${arcstatui_MOC_SRCS} ${arcstatui_RC_SRCS} ${arcstatui_UIS_H} )
ENDIF(APPLE)
+QT5_USE_MODULES(arcstat-ui Core Widgets Concurrent)
+
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/src/common ${Arc_INCLUDE_DIRS} ${GlibmmConfig_INCLUDE_DIR} ${Glibmm_INCLUDE_DIR} ${GlibConfig_INCLUDE_DIR} ${Glib_INCLUDE_DIR} ${SigC++Config_INCLUDE_DIR} ${SigC++_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} ${NSS_INCLUDE_DIR} ${NSPR_INCLUDE_DIR})
target_link_libraries (arcstat-ui ${Arc_LIBRARIES} ${Glibmm_LIBRARY} ${Glib_LIBRARIES} ${SigC++_LIBRARIES} ${LIBXML2_LIBRARIES} ${QT_LIBRARIES} ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES} ${NSS_LIBRARY} ${NSPR_LIBRARY})
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcstat-ui/main.cpp arc-gui-clients-0.4.6-Source/src/arcstat-ui/main.cpp
--- arc-gui-clients-0.4.6-Source.orig/src/arcstat-ui/main.cpp 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcstat-ui/main.cpp 2017-10-11 14:30:27.638296218 +0200
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
#include <QSplashScreen>
#include <QPixmap>
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcstat-ui/qdebugstream.h arc-gui-clients-0.4.6-Source/src/arcstat-ui/qdebugstream.h
--- arc-gui-clients-0.4.6-Source.orig/src/arcstat-ui/qdebugstream.h 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcstat-ui/qdebugstream.h 2017-09-28 21:33:50.336919434 +0200
@@ -16,7 +16,7 @@
#include "qtextedit.h"
-#include <QCustomEvent>
+#include <QEvent>
// Define your custom event identifier
const QEvent::Type DEBUG_STREAM_EVENT = static_cast<QEvent::Type>(QEvent::User + 1);
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/arcfileserver.cpp arc-gui-clients-0.4.6-Source/src/arcstorage-ui/arcfileserver.cpp
--- arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/arcfileserver.cpp 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcstorage-ui/arcfileserver.cpp 2017-10-11 14:10:05.565735325 +0200
@@ -8,6 +8,7 @@
#include <QUrl>
#include <QDebug>
+#include <QtConcurrentRun>
#include "arc-gui-config.h"
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/arcstoragewindow.cpp arc-gui-clients-0.4.6-Source/src/arcstorage-ui/arcstoragewindow.cpp
--- arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/arcstoragewindow.cpp 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcstorage-ui/arcstoragewindow.cpp 2017-10-11 14:04:45.515253757 +0200
@@ -12,7 +12,8 @@
#include <QFileInfo>
#include <QDateTime>
#include <QDesktopServices>
-#include <QMenuItem>
+#include <QDesktopWidget>
+#include <QCompleter>
#include <iostream>
#include "arcstoragewindow.h"
@@ -405,7 +406,7 @@
{
// Check if we should open from command line arguments
- if (QApplication::argc()>1)
+ if (QApplication::arguments().count()>1)
{
QString url = QApplication::arguments().at(1);
logger.msg(Arc::INFO, "Opening url = ", url.toStdString());
@@ -666,7 +667,7 @@
ui->filesTreeWidget->setSortingEnabled(true);
ui->filesTreeWidget->sortByColumn(2, Qt::DescendingOrder);
- ui->filesTreeWidget->header()->setResizeMode(QHeaderView::ResizeToContents);
+ ui->filesTreeWidget->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
for (int i=0; i<8; i++)
ui->filesTreeWidget->resizeColumnToContents(i);
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/arcstoragewindow.h arc-gui-clients-0.4.6-Source/src/arcstorage-ui/arcstoragewindow.h
--- arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/arcstoragewindow.h 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcstorage-ui/arcstoragewindow.h 2017-09-28 21:44:34.885838541 +0200
@@ -16,6 +16,7 @@
#include <QProcess>
#include <QPushButton>
#include <QToolButton>
+#include <QLineEdit>
#include "qdebugstream.h"
#include "transferlistwindow.h"
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/CMakeLists.txt arc-gui-clients-0.4.6-Source/src/arcstorage-ui/CMakeLists.txt
--- arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/CMakeLists.txt 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcstorage-ui/CMakeLists.txt 2017-10-11 14:06:22.785185191 +0200
@@ -1,7 +1,5 @@
add_definitions(-DQT_NO_KEYWORDS)
-include(${QT_USE_FILE})
-
set(arcstorageui_UIS
arcstoragewindow.ui
filepropertiesdialog.ui
@@ -63,9 +61,9 @@
)
# After this call, foo_MOC_SRCS = moc_Class1.cxx moc_Class2.cxx moc_Class3.cxx.
-QT4_WRAP_CPP(arcstorageui_MOC_SRCS ${arcstorageui_MOC_HDRS} )
-QT4_WRAP_UI(arcstorageui_UIS_H ${arcstorageui_UIS} )
-QT4_ADD_RESOURCES(arcstorageui_RC_SRCS ${arcstorageui_RCS} )
+QT5_WRAP_CPP(arcstorageui_MOC_SRCS ${arcstorageui_MOC_HDRS} )
+QT5_WRAP_UI(arcstorageui_UIS_H ${arcstorageui_UIS} )
+QT5_ADD_RESOURCES(arcstorageui_RC_SRCS ${arcstorageui_RCS} )
IF(APPLE)
add_executable(arcstorage-ui
@@ -103,6 +101,8 @@
add_executable(arcstorage-ui ${arcstorageui_SRCS} ${arcstorageui_MOC_SRCS} ${arcstorageui_RC_SRCS} ${arcstorageui_UIS_H} )
ENDIF(APPLE)
+QT5_USE_MODULES(arcstorage-ui Core Widgets WebKitWidgets Concurrent)
+
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/src/common ${Arc_INCLUDE_DIRS} ${GlibmmConfig_INCLUDE_DIR} ${Glibmm_INCLUDE_DIR} ${GlibConfig_INCLUDE_DIR} ${Glib_INCLUDE_DIR} ${SigC++Config_INCLUDE_DIR} ${SigC++_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} ${NSS_INCLUDE_DIR} ${NSPR_INCLUDE_DIR})
target_link_libraries (arcstorage-ui ${Arc_LIBRARIES} ${Glibmm_LIBRARY} ${Glib_LIBRARIES} ${SigC++_LIBRARIES} ${LIBXML2_LIBRARIES} ${QT_LIBRARIES} ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES} ${NSS_LIBRARY} ${NSPR_LIBRARY})
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/dragdropabletreewidget.cpp arc-gui-clients-0.4.6-Source/src/arcstorage-ui/dragdropabletreewidget.cpp
--- arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/dragdropabletreewidget.cpp 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcstorage-ui/dragdropabletreewidget.cpp 2017-09-29 00:08:19.208269529 +0200
@@ -3,6 +3,7 @@
#include <QDragEnterEvent>
#include <QtGui>
#include <QDebug>
+#include <QApplication>
#include "arcstoragewindow.h"
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/globalstateinfo.cpp arc-gui-clients-0.4.6-Source/src/arcstorage-ui/globalstateinfo.cpp
--- arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/globalstateinfo.cpp 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcstorage-ui/globalstateinfo.cpp 2017-10-11 12:59:57.379008787 +0200
@@ -1,6 +1,8 @@
#include "globalstateinfo.h"
#include <QMenu>
+#include <QApplication>
+#include <QDesktopWidget>
#include <arc/Logger.h>
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/main.cpp arc-gui-clients-0.4.6-Source/src/arcstorage-ui/main.cpp
--- arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/main.cpp 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcstorage-ui/main.cpp 2017-10-11 14:30:27.638296218 +0200
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
#include <QSplashScreen>
#include <QPixmap>
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/transferlistwindow.cpp arc-gui-clients-0.4.6-Source/src/arcstorage-ui/transferlistwindow.cpp
--- arc-gui-clients-0.4.6-Source.orig/src/arcstorage-ui/transferlistwindow.cpp 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcstorage-ui/transferlistwindow.cpp 2017-09-29 00:14:35.701138283 +0200
@@ -66,7 +66,7 @@
QStringList labels;
labels << "ID" << "Transfer" << "State" << "Status" << "Action";
ui->transferTable->setHorizontalHeaderLabels(labels);
- ui->transferTable->horizontalHeader()->setResizeMode(1, QHeaderView::Stretch);
+ ui->transferTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
ui->transferTable->verticalHeader()->hide();
ui->transferTable->setShowGrid(true);
//ui->transferTable->setFrameStyle(QFrame::NoFrame);
@@ -181,10 +181,10 @@
if (xfr->transferState()==TS_COMPLETED)
ui->transferTable->item(row, 2)->setText("Completed");
- //ui->transferTable->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
- ui->transferTable->horizontalHeader()->setResizeMode(1, QHeaderView::Stretch);
- ui->transferTable->horizontalHeader()->setResizeMode(2, QHeaderView::ResizeToContents);
- ui->transferTable->horizontalHeader()->setResizeMode(4, QHeaderView::ResizeToContents);
+ //ui->transferTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
+ ui->transferTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
+ ui->transferTable->horizontalHeader()->setSectionResizeMode(2, QHeaderView::ResizeToContents);
+ ui->transferTable->horizontalHeader()->setSectionResizeMode(4, QHeaderView::ResizeToContents);
m_accessLock.unlock();
}
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcsub-ui/CMakeLists.txt arc-gui-clients-0.4.6-Source/src/arcsub-ui/CMakeLists.txt
--- arc-gui-clients-0.4.6-Source.orig/src/arcsub-ui/CMakeLists.txt 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcsub-ui/CMakeLists.txt 2017-10-11 14:06:22.785185191 +0200
@@ -1,7 +1,5 @@
add_definitions(-DQT_NO_KEYWORDS)
-include(${QT_USE_FILE})
-
SET(arcsubui_UIS
jobdefinitionwindow.ui
../common/proxywindow.ui
@@ -38,9 +36,9 @@
)
# After this call, foo_MOC_SRCS = moc_Class1.cxx moc_Class2.cxx moc_Class3.cxx.
-QT4_WRAP_CPP(arcsubui_MOC_SRCS ${arcsubui_MOC_HDRS} )
-QT4_WRAP_UI(arcsubui_UIS_H ${arcsubui_UIS} )
-QT4_ADD_RESOURCES( arcsubui_RC_SRCS ${arcsubui_RCS} )
+QT5_WRAP_CPP(arcsubui_MOC_SRCS ${arcsubui_MOC_HDRS} )
+QT5_WRAP_UI(arcsubui_UIS_H ${arcsubui_UIS} )
+QT5_ADD_RESOURCES( arcsubui_RC_SRCS ${arcsubui_RCS} )
IF(APPLE)
add_executable(arcsub-ui
@@ -75,6 +73,8 @@
add_executable(arcsub-ui ${arcsubui_SRCS} ${arcsubui_MOC_SRCS} ${arcsubui_RC_SRCS} ${arcsubui_UIS_H} )
ENDIF(APPLE)
+QT5_USE_MODULES(arcsub-ui Core Widgets WebKitWidgets Concurrent)
+
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/src/common ${Arc_INCLUDE_DIRS} ${GlibmmConfig_INCLUDE_DIR} ${Glibmm_INCLUDE_DIR} ${GlibConfig_INCLUDE_DIR} ${Glib_INCLUDE_DIR} ${SigC++Config_INCLUDE_DIR} ${SigC++_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} ${NSS_INCLUDE_DIR} ${NSPR_INCLUDE_DIR})
target_link_libraries (arcsub-ui ${Arc_LIBRARIES} ${Glibmm_LIBRARY} ${Glib_LIBRARIES} ${SigC++_LIBRARIES} ${LIBXML2_LIBRARIES} ${QT_LIBRARIES} ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES} ${NSS_LIBRARY} ${NSPR_LIBRARY})
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcsub-ui/jobdefinitionwindow.cpp arc-gui-clients-0.4.6-Source/src/arcsub-ui/jobdefinitionwindow.cpp
--- arc-gui-clients-0.4.6-Source.orig/src/arcsub-ui/jobdefinitionwindow.cpp 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcsub-ui/jobdefinitionwindow.cpp 2017-10-11 13:16:53.556786286 +0200
@@ -145,8 +145,8 @@
QStringList labels;
labels << "Filename" << "Source URL";
ui->inputFileTable->setHorizontalHeaderLabels(labels);
- ui->inputFileTable->horizontalHeader()->setResizeMode(0, QHeaderView::Interactive);
- ui->inputFileTable->horizontalHeader()->setResizeMode(1, QHeaderView::Stretch);
+ ui->inputFileTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Interactive);
+ ui->inputFileTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
ui->inputFileTable->verticalHeader()->hide();
ui->inputFileTable->setShowGrid(true);
ui->inputFileTable->setFrameStyle(QFrame::NoFrame);
@@ -167,8 +167,8 @@
labels.clear();
labels << "Filename" << "Source URL";
ui->perJobFileTable->setHorizontalHeaderLabels(labels);
- ui->perJobFileTable->horizontalHeader()->setResizeMode(0, QHeaderView::Interactive);
- ui->perJobFileTable->horizontalHeader()->setResizeMode(1, QHeaderView::Stretch);
+ ui->perJobFileTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Interactive);
+ ui->perJobFileTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
ui->perJobFileTable->verticalHeader()->hide();
ui->perJobFileTable->setShowGrid(true);
ui->perJobFileTable->setFrameStyle(QFrame::NoFrame);
@@ -188,8 +188,8 @@
labels.clear();
labels << "Filename" << "Target URL";
ui->outputFileTable->setHorizontalHeaderLabels(labels);
- ui->outputFileTable->horizontalHeader()->setResizeMode(0, QHeaderView::Interactive);
- ui->outputFileTable->horizontalHeader()->setResizeMode(1, QHeaderView::Stretch);
+ ui->outputFileTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Interactive);
+ ui->outputFileTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
ui->outputFileTable->verticalHeader()->hide();
ui->outputFileTable->setShowGrid(true);
ui->outputFileTable->setFrameStyle(QFrame::NoFrame);
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcsub-ui/main.cpp arc-gui-clients-0.4.6-Source/src/arcsub-ui/main.cpp
--- arc-gui-clients-0.4.6-Source.orig/src/arcsub-ui/main.cpp 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcsub-ui/main.cpp 2017-10-11 14:30:27.639296207 +0200
@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
#include <QSplashScreen>
#include <QPixmap>
diff -ur arc-gui-clients-0.4.6-Source.orig/src/arcsub-ui/qdebugstream.h arc-gui-clients-0.4.6-Source/src/arcsub-ui/qdebugstream.h
--- arc-gui-clients-0.4.6-Source.orig/src/arcsub-ui/qdebugstream.h 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/arcsub-ui/qdebugstream.h 2017-09-28 21:34:14.702652003 +0200
@@ -16,7 +16,7 @@
#include "qtextedit.h"
-#include <QCustomEvent>
+#include <QEvent>
// Define your custom event identifier
const QEvent::Type DEBUG_STREAM_EVENT = static_cast<QEvent::Type>(QEvent::User + 1);
diff -ur arc-gui-clients-0.4.6-Source.orig/src/common/arcproxy-utils.cpp arc-gui-clients-0.4.6-Source/src/common/arcproxy-utils.cpp
--- arc-gui-clients-0.4.6-Source.orig/src/common/arcproxy-utils.cpp 2017-10-11 13:50:55.518370562 +0200
+++ arc-gui-clients-0.4.6-Source/src/common/arcproxy-utils.cpp 2017-10-11 14:30:27.638296218 +0200
@@ -45,7 +45,7 @@
#include <QDebug>
#include <QFileInfo>
#include <QMessageBox>
-#include <QtGui/QApplication>
+#include <QApplication>
#include <QStyle>
#include <QDesktopWidget>
#include <QInputDialog>
diff -ur arc-gui-clients-0.4.6-Source.orig/src/common/proxywindow.cpp arc-gui-clients-0.4.6-Source/src/common/proxywindow.cpp
--- arc-gui-clients-0.4.6-Source.orig/src/common/proxywindow.cpp 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/common/proxywindow.cpp 2017-09-28 20:47:43.993669261 +0200
@@ -50,11 +50,11 @@
ui->vomsConfigTable->setRowCount(m_proxyController->vomsList().count());
- ui->vomsConfigTable->horizontalHeader()->setResizeMode(0, QHeaderView::ResizeToContents);
- ui->vomsConfigTable->horizontalHeader()->setResizeMode(1, QHeaderView::ResizeToContents);
- ui->vomsConfigTable->horizontalHeader()->setResizeMode(2, QHeaderView::ResizeToContents);
- ui->vomsConfigTable->horizontalHeader()->setResizeMode(3, QHeaderView::ResizeToContents);
- ui->vomsConfigTable->horizontalHeader()->setResizeMode(4, QHeaderView::ResizeToContents );
+ ui->vomsConfigTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+ ui->vomsConfigTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
+ ui->vomsConfigTable->horizontalHeader()->setSectionResizeMode(2, QHeaderView::ResizeToContents);
+ ui->vomsConfigTable->horizontalHeader()->setSectionResizeMode(3, QHeaderView::ResizeToContents);
+ ui->vomsConfigTable->horizontalHeader()->setSectionResizeMode(4, QHeaderView::ResizeToContents );
for (i=0; i<m_proxyController->vomsList().count(); i++)
{
diff -ur arc-gui-clients-0.4.6-Source.orig/src/common/qdebugstream.h arc-gui-clients-0.4.6-Source/src/common/qdebugstream.h
--- arc-gui-clients-0.4.6-Source.orig/src/common/qdebugstream.h 2013-10-17 00:03:09.000000000 +0200
+++ arc-gui-clients-0.4.6-Source/src/common/qdebugstream.h 2017-09-28 21:34:44.759322119 +0200
@@ -16,7 +16,7 @@
#include "qtextedit.h"
-#include <QCustomEvent>
+#include <QEvent>
// Define your custom event identifier
const QEvent::Type DEBUG_STREAM_EVENT = static_cast<QEvent::Type>(QEvent::User + 1);