From aac4395bdb859a3641acdbde5561f3b2fcabd6c3 Mon Sep 17 00:00:00 2001
From: Giacomo Strangolino <giacomo.strangolino@elettra.eu>
Date: Tue, 12 Jul 2022 11:27:24 +0200
Subject: [PATCH] removed commented lines in main.cpp
---
src/main.cpp | 30 +-----------------------------
1 file changed, 1 insertion(+), 29 deletions(-)
diff --git a/src/main.cpp b/src/main.cpp
index 9b84a43..26eb344 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,21 +1,13 @@
#include "4uhv.h"
-// #include <TApplication>
// cumbia
#include <cumbiapool.h>
#include <cuthreadfactoryimpl.h>
#include <qthreadseventbridgefactory.h>
// cumbia
-#include <quapplication.h>// TApplication is mapped into QuApplication. DBus connection is provided by the cumbia dbus plugin // ## added by qumbiaprojectwizard
-// #include <tutil.h>
-// no cumbia include replacement found for tutil.h
+#include <quapplication.h>
#include <X11/Xlib.h>
#include <QX11Info>
-// #include <elettracolors.h>
-// no cumbia include replacement found for elettracolors.h
-
-#define CVSVERSION "$Name: $"
-
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
qu_app.setOrganizationName("-");
qu_app.setApplicationName("-");
- QString version(CVSVERSION);
- qu_app.setApplicationVersion(version);
qu_app.setProperty("author", "Giacomo");
qu_app.setProperty("mail", "giacomo.strangolino@elettra.eu");
qu_app.setProperty("phone", "0403758073");
qu_app.setProperty("office", "T2Pt025");
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();
-
-
-
-
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)
w->setWindowTitle(qu_app.arguments()[1].split('/').last());
w->show();
-
Display *disp = QX11Info::display();
Window root_win = (Window) w->winId();
XSetCommand(disp, root_win, argv, argc);
-
-// exec application loop
int ret = qu_app.exec();
// delete resources and return
delete w;
-
for(std::string n : cu_p->names())
if(cu_p->get(n))
delete cu_p->get(n);
-
return ret;
-
-
}
--
GitLab