aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core/lumina-desktop-unified/src-screensaver
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-01-10 11:30:42 -0500
committerKen Moore <ken@ixsystems.com>2017-01-10 11:30:42 -0500
commit3da4b900fdc3be3b6a86ec18dbf89bd96269540a (patch)
tree003fb83920c8b1dcba2501debcee2f0274ab6c79 /src-qt5/core/lumina-desktop-unified/src-screensaver
parentTranslated using Weblate (l_TERMINAL@cs (generated)) (diff)
downloadlumina-3da4b900fdc3be3b6a86ec18dbf89bd96269540a.tar.gz
lumina-3da4b900fdc3be3b6a86ec18dbf89bd96269540a.tar.bz2
lumina-3da4b900fdc3be3b6a86ec18dbf89bd96269540a.zip
More setup for Lumina2:
1) Make a new "DesktopSettings" class in libLumina for managing desktop settings files. This class understands/uses a hierarchy of files (User Overrides > System Overrides > Default Settings) and layers them as needed for the session. 2) Cleanup the new source tree a lot more, and get it *mostly* compiling (mostly just the backend classes right now - none of the desktop/WM classes yet).
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified/src-screensaver')
-rw-r--r--src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.h2
-rw-r--r--src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.h4
-rw-r--r--src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h2
-rw-r--r--src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.h4
-rw-r--r--src-qt5/core/lumina-desktop-unified/src-screensaver/animations/SampleAnimation.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.h
index 040499c1..5470128a 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.h
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.h
@@ -7,7 +7,7 @@
#ifndef _LUMINA_DESKTOP_LOCK_SCREEN_WIDGET_H
#define _LUMINA_DESKTOP_LOCK_SCREEN_WIDGET_H
-#include "GlobalDefines.h"
+#include "global-includes.h"
namespace Ui{
class LLockScreen;
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.h
index 5119d8b1..d27db37e 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.h
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.h
@@ -7,7 +7,7 @@
#ifndef _LUMINA_DESKTOP_SCREEN_SAVER_H
#define _LUMINA_DESKTOP_SCREEN_SAVER_H
-#include "GlobalDefines.h"
+#include "global-includes.h"
#include "SSBaseWidget.h"
#include "LLockScreen.h"
@@ -56,4 +56,4 @@ protected:
};
-#endif \ No newline at end of file
+#endif
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h
index a6574679..bdcefa24 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h
@@ -9,7 +9,7 @@
#ifndef _LUMINA_DESKTOP_SCREEN_SAVER_BASE_WIDGET_H
#define _LUMINA_DESKTOP_SCREEN_SAVER_BASE_WIDGET_H
-#include "GlobalDefines.h"
+#include "global-includes.h"
#include "animations/BaseAnimGroup.h"
class SSBaseWidget : public QWidget{
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.h
index dd7269d4..3b442281 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.h
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.h
@@ -10,7 +10,7 @@
#ifndef _LUMINA_DESKTOP_SCREEN_SAVER_BASE_ANIMATION_GROUP_H
#define _LUMINA_DESKTOP_SCREEN_SAVER_BASE_ANIMATION_GROUP_H
-#include "GlobalDefines.h"
+#include "global-includes.h"
class BaseAnimGroup : public QParallelAnimationGroup{
Q_OBJECT
@@ -34,4 +34,4 @@ public:
};
-#endif \ No newline at end of file
+#endif
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/SampleAnimation.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/SampleAnimation.h
index e0f11ba5..972a5109 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/SampleAnimation.h
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/SampleAnimation.h
@@ -9,7 +9,7 @@
#ifndef _LUMINA_DESKTOP_SCREEN_SAVER_SAMPLE_ANIMATION_H
#define _LUMINA_DESKTOP_SCREEN_SAVER_SAMPLE_ANIMATION_H
-#include "GlobalDefines.h"
+#include "global-includes.h"
#include "BaseAnimGroup.h"
class SampleAnimation : public BaseAnimGroup{
bgstack15