I have made the following changes intended for : CE:UX:MTF / lipstick Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/7848 Thank You, vesuri [This message was auto-generated] --- Request # 7848: Messages from BOSS: State: review at 2013-02-11T14:49:52 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:vesuri:branches:CE:UX:MTF / lipstick -> CE:UX:MTF / lipstick changes files: -------------- --- lipstick.changes +++ lipstick.changes @@ -0,0 +1,3 @@ +* Mon Feb 11 2013 Vesa Halttunen <[email protected]> - 0.9.1 +- Install some headers useful in homescreen implementations (from Vesa) + old: ---- lipstick-0.9.0.tar.bz2 new: ---- lipstick-0.9.1.tar.bz2 spec files: ----------- --- lipstick.spec +++ lipstick.spec @@ -9,7 +9,7 @@ # << macros Summary: QML toolkit for homescreen creation -Version: 0.9.0 +Version: 0.9.1 Release: 1 Group: System/Libraries License: LGPLv2.1 other changes: -------------- ++++++ lipstick-0.9.0.tar.bz2 -> lipstick-0.9.1.tar.bz2 --- src/notifications/notificationmanager.cpp +++ src/notifications/notificationmanager.cpp @@ -284,7 +284,7 @@ } QString databaseName = configPath + "/notifications.db"; - *database = QSqlDatabase::addDatabase("QSQLITE"); + *database = QSqlDatabase::addDatabase("QSQLITE", metaObject()->className()); database->setDatabaseName(databaseName); bool success = checkForDiskSpace(configPath, MINIMUM_FREE_SPACE_NEEDED_IN_KB); if (success) { @@ -303,7 +303,7 @@ if (success) { // Set up the database mode to write-ahead locking to improve performance - QSqlQuery().exec("PRAGMA journal_mode=WAL"); + QSqlQuery(*database).exec("PRAGMA journal_mode=WAL"); } return success; @@ -382,8 +382,8 @@ bool result = false; if (database->isOpen()) { - QSqlQuery().exec("DROP TABLE " + tableName); - result = QSqlQuery().exec("CREATE TABLE " + tableName + " (" + definition + ")"); + QSqlQuery(*database).exec("DROP TABLE " + tableName); + result = QSqlQuery(*database).exec("CREATE TABLE " + tableName + " (" + definition + ")"); } return result; @@ -392,7 +392,7 @@ void NotificationManager::fetchData() { // Gather actions for each notification - QSqlQuery actionsQuery("SELECT * FROM actions"); + QSqlQuery actionsQuery("SELECT * FROM actions", *database); QSqlRecord actionsRecord = actionsQuery.record(); int actionsTableIdFieldIndex = actionsRecord.indexOf("id"); int actionsTableActionFieldIndex = actionsRecord.indexOf("action"); @@ -403,7 +403,7 @@ } // Gather hints for each notification - QSqlQuery hintsQuery("SELECT * FROM hints"); + QSqlQuery hintsQuery("SELECT * FROM hints", *database); QSqlRecord hintsRecord = hintsQuery.record(); int hintsTableIdFieldIndex = hintsRecord.indexOf("id"); int hintsTableHintFieldIndex = hintsRecord.indexOf("hint"); @@ -415,7 +415,7 @@ } // Create the notifications - QSqlQuery notificationsQuery("SELECT * FROM notifications"); + QSqlQuery notificationsQuery("SELECT * FROM notifications", *database); QSqlRecord notificationsRecord = notificationsQuery.record(); int notificationsTableIdFieldIndex = notificationsRecord.indexOf("id"); int notificationsTableAppNameFieldIndex = notificationsRecord.indexOf("app_name"); @@ -467,7 +467,7 @@ database->transaction(); } - QSqlQuery query; + QSqlQuery query(*database); query.prepare(command); foreach(const QVariant &arg, args) { --- src/src.pro +++ src/src.pro @@ -3,7 +3,7 @@ TEMPLATE = lib TARGET = lipstick -VERSION = 0.9.0 +VERSION = 0.9.1 DEFINES += LIPSTICK_BUILD_LIBRARY VERSION=\\\"$$VERSION\\\" @@ -16,6 +16,8 @@ MOC_DIR = .moc PUBLICHEADERS += \ + utilities/qobjectlistmodel.h \ + utilities/closeeventeater.h \ homeapplication.h \ lipstickglobal.h \ components/windowinfo.h \ @@ -42,29 +44,22 @@ HEADERS += \ $$PUBLICHEADERS \ - utilities/qobjectlistmodel.h \ - utilities/closeeventeater.h \ xtools/homewindowmonitor.h \ xtools/windowmonitor.h \ xtools/xwindowmanager.h \ xtools/x11wrapper.h \ lipsticksettings.h \ - notifications/notificationmanager.h \ notifications/notificationmanageradaptor.h \ - notifications/notification.h \ notifications/categorydefinitionstore.h \ - notifications/notificationlistmodel.h \ notifications/lowbatterynotifier.h \ + notifications/notificationfeedbackplayer.h \ + notifications/batterynotifier.h \ screenlock/eventeater.h \ screenlock/screenlock.h \ screenlock/screenlockadaptor.h \ volume/volumecontrol.h \ volume/pulseaudiocontrol.h \ - volume/volumekeylistener.h \ - notifications/notificationfeedbackplayer.h \ - notifications/batterynotifier.h \ - usbmodeselector.h \ - shutdownscreen.h + volume/volumekeylistener.h SOURCES += \ homeapplication.cpp \ --- src/utilities/closeeventeater.h +++ src/utilities/closeeventeater.h @@ -18,13 +18,14 @@ #define CLOSEEVENTEATER_H_ #include <QObject> +#include "lipstickglobal.h" /*! * Close event eater is an object that "eats" QCloseEvents by accepting them. * It can be installed to windows so that they will not react to CTRL-Q * presses. */ -class CloseEventEater : public QObject +class LIPSTICK_EXPORT CloseEventEater : public QObject { Q_OBJECT ++++++ lipstick.yaml --- lipstick.yaml +++ lipstick.yaml @@ -1,6 +1,6 @@ Name: lipstick Summary: QML toolkit for homescreen creation -Version: 0.9.0 +Version: 0.9.1 Release: 1 Group: System/Libraries License: LGPLv2.1
