Skip to content

Commit

Permalink
Revert d2c0d2e (#358)
Browse files Browse the repository at this point in the history
  • Loading branch information
tsujan authored Jan 12, 2025
1 parent d2c0d2e commit 7b66ae5
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 24 deletions.
22 changes: 11 additions & 11 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ liblxqt-0.14.0 / 2019-01-25
- lxqtpageselectwidget: Fixed config dialog select widget cells
* Improved cmake scripting
- Set cmake_minimum_required to 3.1.0
- Removed locale compile definitions
- Removed locale compile definitons
* Moved translations from lxqt-l10n back to liblxqt
- Removed obsolete translation fuctionality
- Added translation promo in README.md
Expand Down Expand Up @@ -190,7 +190,7 @@ liblxqt-0.13.0 / 2018-05-21
===================

* Release 0.11.0: Add changelog
* Bump version to 0.11.0 (#105)
* Bump version ot 0.11.0 (#105)
* Settings: Make use of reverse_iterator conditional
* Application: Add <cerrno> include
* Settings: Add "homemade" XDG_CONFIG_DIRS support
Expand Down Expand Up @@ -308,7 +308,7 @@ liblxqt-0.13.0 / 2018-05-21
* Updates translations
* Moves the about dialog to lxqt-about
* debug: showing qDebug()/qWarning() only in "debug" build
* LxQtTheme: removed superfluous warning (can't occur)
* LxQtTheme: removed superfluous warning (can't occure)
* debug: strip debug messages in "release" build
* Remove AddPluginDialog as it is no longer used
* Hungarian translation update
Expand Down Expand Up @@ -351,7 +351,7 @@ liblxqt-0.13.0 / 2018-05-21
* remove not needed whitespaces
* Adds StartOptions to the SingleApplication class
* Adds the LxQt::SingleApplication class.
* CMakeLists.txt maintenance
* CMakeLists.txt maintenaince
* Fixes yet another translations install dir mistake
* Get rid of USE_QT5 in lxqt-config.cmake
* Fixes translations install dir
Expand Down Expand Up @@ -394,7 +394,7 @@ liblxqt-0.13.0 / 2018-05-21
* Fix top-to-bottom layout x-coord calculation
* Fix broken *.ts files and update to the latest strings.
* Replace LXDE-Qt with LXQt.
* Add -locations absolute option to lupdate so our *.ts files can contain information about the source lines.
* Add -locations absolute option to lupdate so our *.ts files can contain informations about the source lines.
* Fix incorrect namespace in the *.ts files.
* Add code to update the *.ts files when the UPDATE_TRANSLATIONS option is turned on.
* Fix context names which uses C++ namespaces in all of the *.ts files.
Expand All @@ -421,10 +421,10 @@ liblxqt-0.13.0 / 2018-05-21
* Use newer version of cmake 2.8.9
* Detect the path of qmake correctly for Qt5.
* Fix internal include
* Fix after merging from master, by removing duplicated items
* Fix after merging from master, by removing dupplicated items
* Merge branch 'master' of https://github.com/lxde/liblxqt into qt5
* Update qt5 porting
* Update Turkish translations
* Update Turkish tranlations
* Set include dirs properly.
* Install pkgconfig file to /usr/local/libdata/pkgconfig when FreeBSD is detected.
* Set link directories properly
Expand Down Expand Up @@ -590,7 +590,7 @@ liblxqt-0.13.0 / 2018-05-21
* Small improvement to dialog icon sizing
* Don't reset when pressing Enter
* reduce error messages when there is no session running in razor-power
* QDbusError cannot be print out on Ubuntu version of qt
* QDbusError canot be print out on Ubuntu version of qt
* notification client library uses a QMessageBox failback message when it's not able to send a dbus message
* fixed #147 razorpower: things to implement - notifications
* default arguments for notification client lib
Expand All @@ -615,7 +615,7 @@ liblxqt-0.13.0 / 2018-05-21
* fix for theme loading when there is no theme specified in config
* Added localizedValue() in RazorSettings
* Fix: wrong path for debug log
* Config corresponds XDG directory specification
* Config coresponds XDG directory specification
* Transifex desktop: sr_BA.ts should be a local
* strongly enhances debugging
* Transifex desktop: local translations
Expand All @@ -639,7 +639,7 @@ liblxqt-0.13.0 / 2018-05-21
* Env variables for plugins dirs RAZORQT_DESKTOP_PLUGINS_DIR & RAZORQT_DESKTOP_PLUGINS_SO_DIR RAZORQT_PANEL_PLUGINS_DIR & RAZORQT_PANEL_PLUGINS_SO_DIR
* Create a "standardized" configuration dialog
* Relicense razorqtlib
* XdgAutoStart rewritten (lgpl2+)
* XdgAutoStart rewriten (lgpl2+)
* Fix gmail.ru -> gmail.com
* Issue#147 add return value to provide a valuable feedback to user
* menus are adopted to the new backends; old code removed; check for running razor-session to allow/disallow "logout" item
Expand Down Expand Up @@ -668,7 +668,7 @@ liblxqt-0.13.0 / 2018-05-21
* New doxygen ifrastructure
* power manager: list actions only if is user allowed to call it
* fixed warning: The Free Software Foundation address in this file seems to be outdated
* devel-docs generated in CMAKE_BINARY_DIR/docs including dummy index.html
* devel-docs generated in CMAKE_BINARY_DIR/docs includig dummy index.html
* missing translations in CMakeLists
* XdgDesktopFile is implicitly shared
* huge refactoring of the libraries build organization
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ set(LXQT_MINOR_VERSION 1)
#
# In a perfect world all components would have the same major- and minor- and
# patch-version as liblxqt - in real life it will be fine if every component
# has it's own patch version within a major/minor life cycle.
# has it's own patch version within a major/minor life cyle.
#
set(LXQT_PATCH_VERSION 0)
set(LXQT_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_PATCH_VERSION})
Expand Down Expand Up @@ -272,7 +272,7 @@ set(CFG_LXQT_TARGETS_FILE "${LXQT_INTREE_TARGETS_FILE}")
configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/lxqt-config.cmake.in"
"${CMAKE_BINARY_DIR}/${LXQT_LIBRARY_NAME}-config.cmake"
INSTALL_DESTINATION "neverland" # required, although we don't install it
INSTALL_DESTINATION "neverland" # required, altough we don't install it
)

#************************************************
Expand Down
2 changes: 1 addition & 1 deletion cmake/lxqt-config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ find_dependency(lxqt2-build-tools @LXQTBT_MINIMUM_VERSION@)
include(LXQtConfigVars)


# - Set version information
# - Set version informations
set(LXQT_MAJOR_VERSION "@LXQT_MAJOR_VERSION@")
set(LXQT_MINOR_VERSION "@LXQT_MINOR_VERSION@")
set(LXQT_PATCH_VERSION "@LXQT_PATCH_VERSION@")
Expand Down
4 changes: 2 additions & 2 deletions lxqtapplication.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,11 @@ namespace
QScopedPointer<SignalHandler> SignalHandler::instance;
}

void Application::listenToUnixSignals(QList<int> const & signalList)
void Application::listenToUnixSignals(QList<int> const & signoList)
{
static QScopedPointer<QSocketNotifier> signal_notifier;

if (SignalHandler::instance.isNull())
SignalHandler::instance.reset(new SignalHandler{this, [this] (int signo) { Q_EMIT unixSignal(signo); }});
SignalHandler::instance->listenToSignals(signalList);
SignalHandler::instance->listenToSignals(signoList);
}
4 changes: 2 additions & 2 deletions lxqtapplication.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ class LXQT_API Application : public QApplication
/*! Construct a LXQt application object.
* \param argc standard argc as in QApplication
* \param argv standard argv as in QApplication
* \param handleQuitSignals flag if signals SIGINT, SIGTERM, SIGHUP should be handled internally (\sa quit() application)
* \param handleQuitSignals flag if signals SIGINT, SIGTERM, SIGHUP should be handled internaly (\sa quit() application)
*/
Application(int &argc, char **argv, bool handleQuitSignals);
~Application() override {}
/*! Install UNIX signal handler for signals defined in \param signalList
* Upon receiving of any of this signals the \sa unixSignal signal is emitted
*/
void listenToUnixSignals(QList<int> const & signalList);
void listenToUnixSignals(QList<int> const & signolList);

private Q_SLOTS:
void updateTheme();
Expand Down
6 changes: 3 additions & 3 deletions lxqtnotification.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ void Notification::notify(const QString& summary, const QString& body, const QSt
notification.update();
}

bool NotificationPrivate::sIsServerInfoQueried = 0;
bool NotificationPrivate::sIsServerInfoQuried = 0;
Notification::ServerInfo NotificationPrivate::sServerInfo;

NotificationPrivate::NotificationPrivate(const QString& summary, Notification* parent) :
Expand Down Expand Up @@ -180,7 +180,7 @@ void NotificationPrivate::setActions(QStringList actions, int defaultAction)

const Notification::ServerInfo NotificationPrivate::serverInfo()
{
if (!sIsServerInfoQueried) {
if (!sIsServerInfoQuried) {
queryServerInfo (/*async=*/false);
}

Expand All @@ -207,7 +207,7 @@ void NotificationPrivate::queryServerInfo(bool async)
sServerInfo.version.clear();
sServerInfo.specVersion.clear();
}
sIsServerInfoQueried = true;
sIsServerInfoQuried = true;
Q_EMIT q->serverInfoReady();
sender()->deleteLater();
});
Expand Down
2 changes: 1 addition & 1 deletion lxqtnotification.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class LXQT_API Notification : public QObject
const ServerInfo serverInfo();

/*!
* \brief Performs an asynchronous query of the notifications server information.
* \brief Performs an asyncronous query of the notifications server information.
* Use serverInfoReady signal to get notified (no pun intended) when the
* info will be received.
* \sa serverInfo()
Expand Down
2 changes: 1 addition & 1 deletion lxqtnotification_p.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public Q_SLOTS:
int mTimeout;

static Notification::ServerInfo sServerInfo;
static bool sIsServerInfoQueried;
static bool sIsServerInfoQuried;

Notification* const q_ptr;
Q_DECLARE_PUBLIC(Notification)
Expand Down
2 changes: 1 addition & 1 deletion lxqtsettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ void Settings::addWatchedFile(QString const & path)
// Luckily, I found a workaround: If the file path no longer exists
// in the watcher's files(), this file is deleted.
if(!d_ptr->mWatcher.files().contains(path))
// in some situations adding fails because of non-existing file (e.g. editing file in external program)
// in some situations adding fails because of non-existing file (e.g. editting file in external program)
if (!d_ptr->mWatcher.addPath(path) && 0 == d_ptr->mAddWatchTimer)
d_ptr->mAddWatchTimer = startTimer(100);

Expand Down

0 comments on commit 7b66ae5

Please sign in to comment.