This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gothinclient. from 472f75c debian/rules: call qmake instead of qmake-qt5. new 20fe92d cdmanager/powerej/mb.{cpp,h}: whitespace only. new 979253e cdmanager/powerej/powerej.pro: regenerate with Qt5's qmake and merge. new a1ae2f4 cdmanager/powerej/eject.cpp: use PlastiqueStyle with Qt4 and Fusion with Qt5. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: cdmanager/powerej/eject.cpp | 10 +++++++++- cdmanager/powerej/mb.cpp | 20 ++++++++++---------- cdmanager/powerej/mb.h | 2 +- cdmanager/powerej/powerej.pro | 17 +++++++++++++++-- debian/changelog | 4 ++++ 5 files changed, 39 insertions(+), 14 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 20fe92d1364ada46b4d6a4e17689e1c6e4fdc8ad Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 23 03:46:28 2018 +0100 cdmanager/powerej/mb.{cpp,h}: whitespace only. --- cdmanager/powerej/mb.cpp | 20 ++++++++++---------- cdmanager/powerej/mb.h | 2 +- debian/changelog | 1 + 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cdmanager/powerej/mb.cpp b/cdmanager/powerej/mb.cpp index 95747e7..a849225 100644 --- a/cdmanager/powerej/mb.cpp +++ b/cdmanager/powerej/mb.cpp @@ -18,23 +18,23 @@ void MPushButton::slot_cl() FILE* ptr=fopen("/proc/mounts","rt"); if(!ptr) { - qDebug()<<"couldn't open"; - return; + qDebug()<<"couldn't open"; + return; } - + char ln[255]; while(!feof(ptr)) { fgets(ln,254,ptr); QString line = ln; - if(line.indexOf("CDROM")!=-1) - { - QStringList arg; - arg<<line.split(" ")[0]; - qDebug()<<"Ejecting: "<<arg[0]; - QProcess::startDetached("eject",arg); - } + if(line.indexOf("CDROM")!=-1) + { + QStringList arg; + arg<<line.split(" ")[0]; + qDebug()<<"Ejecting: "<<arg[0]; + QProcess::startDetached("eject",arg); + } } fclose(ptr); } diff --git a/cdmanager/powerej/mb.h b/cdmanager/powerej/mb.h index 7fc94ea..c08cba9 100644 --- a/cdmanager/powerej/mb.h +++ b/cdmanager/powerej/mb.h @@ -1,5 +1,5 @@ #ifndef _______MB_H_ -#define _______MB_H_ +#define _______MB_H_ #include <QPushButton> class MPushButton: public QPushButton diff --git a/debian/changelog b/debian/changelog index 325ad78..2294852 100644 --- a/debian/changelog +++ b/debian/changelog @@ -120,6 +120,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low - misc: update Oleksandr's mail address. - misc manpages: whitespace only. - misc manpages: pre-release version and date updates. + - cdmanager/powerej/mb.{cpp,h}: whitespace only. * usbmount/x2gousbmount: - Fix typo int -> print. Fixes: #840. - Update copyright notice. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 979253eeaf1f8c87e53841b4f91c7d9e08d82066 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 23 03:49:49 2018 +0100 cdmanager/powerej/powerej.pro: regenerate with Qt5's qmake and merge. --- cdmanager/powerej/powerej.pro | 17 +++++++++++++++-- debian/changelog | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/cdmanager/powerej/powerej.pro b/cdmanager/powerej/powerej.pro index fc0f72d..cf1ba4f 100644 --- a/cdmanager/powerej/powerej.pro +++ b/cdmanager/powerej/powerej.pro @@ -1,12 +1,25 @@ ###################################################################### -# Automatically generated by qmake (2.01a) Fr Jun 1 09:19:29 2007 +# Automatically generated by qmake (3.1) Fri Nov 23 03:41:04 2018 ###################################################################### TEMPLATE = app TARGET = x2goejectcd -DEPENDPATH += . INCLUDEPATH += . +# The following define makes your compiler warn you if you use any +# feature of Qt which has been marked as deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if you use deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +# Used modules. +QT += widgets + # Input HEADERS += mb.h SOURCES += eject.cpp mb.cpp diff --git a/debian/changelog b/debian/changelog index 2294852..fdc4466 100644 --- a/debian/changelog +++ b/debian/changelog @@ -121,6 +121,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low - misc manpages: whitespace only. - misc manpages: pre-release version and date updates. - cdmanager/powerej/mb.{cpp,h}: whitespace only. + - cdmanager/powerej/powerej.pro: regenerate with Qt5's qmake and merge. * usbmount/x2gousbmount: - Fix typo int -> print. Fixes: #840. - Update copyright notice. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit a1ae2f493a0be6e77e838857d7d96079345a0557 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 23 03:54:28 2018 +0100 cdmanager/powerej/eject.cpp: use PlastiqueStyle with Qt4 and Fusion with Qt5. --- cdmanager/powerej/eject.cpp | 10 +++++++++- debian/changelog | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cdmanager/powerej/eject.cpp b/cdmanager/powerej/eject.cpp index 4d723a4..57aa542 100644 --- a/cdmanager/powerej/eject.cpp +++ b/cdmanager/powerej/eject.cpp @@ -28,14 +28,22 @@ #include <QLocale> #include <QFrame> #include <mb.h> -#include <QPlastiqueStyle> #include <QDesktopWidget> +#if QT_VERSION < 0x050000 +#include <QPlastiqueStyle> +#endif + using namespace std; int main(int argc, char *argv[]) { QApplication app(argc,argv); + +#if QT_VERSION < 0x050000 app.setStyle(new QPlastiqueStyle()); +#else + app.setStyle(QStyleFactory::create("fusion")); +#endif // QFrame*fr =new QFrame(0,Qt::WindowStaysOnTopHint|Qt::X11BypassWindowManagerHint); MPushButton*fr =new MPushButton(); diff --git a/debian/changelog b/debian/changelog index fdc4466..b62ea87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -122,6 +122,8 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low - misc manpages: pre-release version and date updates. - cdmanager/powerej/mb.{cpp,h}: whitespace only. - cdmanager/powerej/powerej.pro: regenerate with Qt5's qmake and merge. + - cdmanager/powerej/eject.cpp: use PlastiqueStyle with Qt4 and Fusion with + Qt5. * usbmount/x2gousbmount: - Fix typo int -> print. Fixes: #840. - Update copyright notice. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
-
git-admin＠x2go.org