Skip to content
Snippets Groups Projects
Commit aac4395b authored by Giacomo Strangolino's avatar Giacomo Strangolino
Browse files

removed commented lines in main.cpp

parent 4100d1e0
Branches cumbia_porting
No related tags found
No related merge requests found
#include "4uhv.h" #include "4uhv.h"
// #include <TApplication>
// cumbia // cumbia
#include <cumbiapool.h> #include <cumbiapool.h>
#include <cuthreadfactoryimpl.h> #include <cuthreadfactoryimpl.h>
#include <qthreadseventbridgefactory.h> #include <qthreadseventbridgefactory.h>
// cumbia // cumbia
#include <quapplication.h>// TApplication is mapped into QuApplication. DBus connection is provided by the cumbia dbus plugin // ## added by qumbiaprojectwizard #include <quapplication.h>
// #include <tutil.h>
// no cumbia include replacement found for tutil.h
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <QX11Info> #include <QX11Info>
// #include <elettracolors.h>
// no cumbia include replacement found for elettracolors.h
#define CVSVERSION "$Name: $"
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
...@@ -24,46 +16,26 @@ int main(int argc, char *argv[]) ...@@ -24,46 +16,26 @@ int main(int argc, char *argv[])
QuApplication qu_app( argc, argv );// TApplication is mapped into QuApplication. DBus connection is provided by cumbia dbus plugin // ## added by qumbiaprojectwizard QuApplication qu_app( argc, argv );// TApplication is mapped into QuApplication. DBus connection is provided by cumbia dbus plugin // ## added by qumbiaprojectwizard
qu_app.setOrganizationName("-"); qu_app.setOrganizationName("-");
qu_app.setApplicationName("-"); qu_app.setApplicationName("-");
QString version(CVSVERSION);
qu_app.setApplicationVersion(version);
qu_app.setProperty("author", "Giacomo"); qu_app.setProperty("author", "Giacomo");
qu_app.setProperty("mail", "giacomo.strangolino@elettra.eu"); qu_app.setProperty("mail", "giacomo.strangolino@elettra.eu");
qu_app.setProperty("phone", "0403758073"); qu_app.setProperty("phone", "0403758073");
qu_app.setProperty("office", "T2Pt025"); qu_app.setProperty("office", "T2Pt025");
qu_app.setProperty("hwReferent", "-"); /* name of the referent that provides the device server */ qu_app.setProperty("hwReferent", "-"); /* name of the referent that provides the device server */
// TUtil::instance()->setLoggingTarget(argv[0]);
// QTango TUtil:: class is not present in cumbia // ## added by qumbiaprojectwizard
CumbiaPool *cu_p = new CumbiaPool(); CumbiaPool *cu_p = new CumbiaPool();
FourUHV *w = new FourUHV(cu_p, 0); FourUHV *w = new FourUHV(cu_p, 0);
// if(w->property("epalette").isValid())
// EPalette is not currently available in cumbia // ## added by qumbiaprojectwizard
// qu_app.setPalette(EPalette(w->property("epalette").toString()));
// EPalette is not currently available in cumbia // ## added by qumbiaprojectwizard
if (qu_app.arguments().size() > 1) if (qu_app.arguments().size() > 1)
w->setWindowTitle(qu_app.arguments()[1].split('/').last()); w->setWindowTitle(qu_app.arguments()[1].split('/').last());
w->show(); w->show();
Display *disp = QX11Info::display(); Display *disp = QX11Info::display();
Window root_win = (Window) w->winId(); Window root_win = (Window) w->winId();
XSetCommand(disp, root_win, argv, argc); XSetCommand(disp, root_win, argv, argc);
// exec application loop
int ret = qu_app.exec(); int ret = qu_app.exec();
// delete resources and return // delete resources and return
delete w; delete w;
for(std::string n : cu_p->names()) for(std::string n : cu_p->names())
if(cu_p->get(n)) if(cu_p->get(n))
delete cu_p->get(n); delete cu_p->get(n);
return ret; return ret;
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment