Rename razor to lxqt and fix XdgDir header inclusion.
authorHone Jen Yee (PCMan) <pcman.tw@gmail.com>
Thu, 17 Oct 2013 08:34:04 +0000 (16:34 +0800)
committerHone Jen Yee (PCMan) <pcman.tw@gmail.com>
Thu, 17 Oct 2013 08:34:04 +0000 (16:34 +0800)
CMakeLists.txt
lxqtautostartentry.h
lxqtsettings.cpp
lxqttranslator.cpp

index 6663241..a8aa080 100644 (file)
@@ -135,7 +135,7 @@ include_directories (
     ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
     ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTDBUS_INCLUDE_DIR}
     ${X11_INCLUDE_DIR}
-    ${CMAKE_SOURCE_DIR}/libraries
+    ${QTXDG_INCLUDE_DIRS}
 )
 
 set(LXQT_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_PATCH_VERSION})
index 0f5da67..af60c8f 100644 (file)
@@ -43,7 +43,7 @@ class AutostartEntry
 {
 public:
     /*! Constructs an AutostartEntry object for a specific entry.
-     * \param name The name of the autostart desktop file (e.g. "razor-panel.desktop")
+     * \param name The name of the autostart desktop file (e.g. "lxqt-panel.desktop")
      */
     AutostartEntry(const QString& name);
 
@@ -56,7 +56,7 @@ public:
     //! Returns the "active" desktop file
     const XdgDesktopFile& file() const;
 
-    //! Returns the name of the autostart entry (e.g. "razor-panel.desktop")
+    //! Returns the name of the autostart entry (e.g. "lxqt-panel.desktop")
     QString name() const;
 
     /*! Sets to the specified desktop file. Use this to make modifications.
index c113453..1cb268f 100644 (file)
@@ -94,7 +94,7 @@ public:
 
  ************************************************/
 Settings::Settings(const QString& module, QObject* parent) :
-    QSettings("razor", module, parent),
+    QSettings("lxqt", module, parent),
     d_ptr(new SettingsPrivate(this))
 {
     // HACK: we need to ensure that the user (~/.config/razor/<module>.conf)
@@ -531,7 +531,7 @@ QList<RazorTheme> RazorTheme::allThemes()
         foreach(QFileInfo dir, dirs)
         {
             if (!processed.contains(dir.fileName()) &&
-                 QDir(dir.absoluteFilePath()).exists("razor-panel.qss"))
+                 QDir(dir.absoluteFilePath()).exists("lxqt-panel.qss"))
             {
                 processed << dir.fileName();
                 ret << RazorTheme(dir.absoluteFilePath());
index 0d85a2f..cf94577 100644 (file)
@@ -5,7 +5,7 @@
 #include <QCoreApplication>
 #include <QLibraryInfo>
 #include <QStringList>
-#include <XdgDirs>
+#include <qtxdg/XdgDirs>
 #include <QFileInfo>
 
 using namespace LxQt;