File 0001-Make-constants-const-saves-a-few-symbols-i... of Package kwindowsystem

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Make-constants-const-saves-a-few-symbols-in-the-.dat.patch of Package kwindowsystem (Revision 4edcf5b1c19e850a206704563d2ad8f7)

Currently displaying revision 4edcf5b1c19e850a206704563d2ad8f7 , Show latest

From b2db22fd2598fb64a89f4b2c6d30f0d5b442a86c Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Sun, 14 Sep 2014 16:48:38 +0200
Subject: [PATCH 01/13] Make constants const, saves a few symbols in the .data
 section.

---
 src/kwindoweffects_x11.cpp | 2 +-
 src/kwindowsystem_x11.cpp  | 8 ++++----
 src/netwm.cpp              | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/kwindoweffects_x11.cpp b/src/kwindoweffects_x11.cpp
index 66aaca3..661a0af 100644
--- a/src/kwindoweffects_x11.cpp
+++ b/src/kwindoweffects_x11.cpp
@@ -29,7 +29,7 @@
 #include <QX11Info>
 #include <QMatrix4x4>
 
-static const char *DASHBOARD_WIN_CLASS = "dashboard\0dashboard";
+static const char DASHBOARD_WIN_CLASS[] = "dashboard\0dashboard";
 using namespace KWindowEffects;
 
 KWindowEffectsPrivateX11::KWindowEffectsPrivateX11()
diff --git a/src/kwindowsystem_x11.cpp b/src/kwindowsystem_x11.cpp
index 46fbc7d..db77003 100644
--- a/src/kwindowsystem_x11.cpp
+++ b/src/kwindowsystem_x11.cpp
@@ -50,7 +50,7 @@
 static Atom net_wm_cm;
 static void create_atoms(Display *dpy = QX11Info::display());
 
-static NET::Properties windowsProperties = NET::ClientList | NET::ClientListStacking |
+static const NET::Properties windowsProperties = NET::ClientList | NET::ClientListStacking |
                                                  NET::Supported |
                                                  NET::NumberOfDesktops |
                                                  NET::DesktopGeometry |
@@ -59,11 +59,11 @@ static NET::Properties windowsProperties = NET::ClientList | NET::ClientListStac
                                                  NET::DesktopNames |
                                                  NET::ActiveWindow |
                                                  NET::WorkArea;
-static NET::Properties2 windowsProperties2 = NET::WM2ShowingDesktop;
+static const NET::Properties2 windowsProperties2 = NET::WM2ShowingDesktop;
 
 // ClientList and ClientListStacking is not per-window information, but a desktop information,
 // so track it even with only INFO_BASIC
-static NET::Properties desktopProperties = NET::ClientList | NET::ClientListStacking |
+static const NET::Properties desktopProperties = NET::ClientList | NET::ClientListStacking |
                                                  NET::Supported |
                                                  NET::NumberOfDesktops |
                                                  NET::DesktopGeometry |
@@ -72,7 +72,7 @@ static NET::Properties desktopProperties = NET::ClientList | NET::ClientListStac
                                                  NET::DesktopNames |
                                                  NET::ActiveWindow |
                                                  NET::WorkArea;
-static NET::Properties2 desktopProperties2 = NET::WM2ShowingDesktop;
+static const NET::Properties2 desktopProperties2 = NET::WM2ShowingDesktop;
 
 MainThreadInstantiator::MainThreadInstantiator(KWindowSystemPrivateX11::FilterInfo _what)
     : QObject(),
diff --git a/src/netwm.cpp b/src/netwm.cpp
index a0a2fae..07e5254 100644
--- a/src/netwm.cpp
+++ b/src/netwm.cpp
@@ -4771,7 +4771,7 @@ void NETWinInfo::setActivities(const char *activities)
 
     if (activities == (char *) NULL || activities[0] == '\0') {
         // on all activities
-        static const char *nulluuid = KDE_ALL_ACTIVITIES_UUID;
+        static const char nulluuid[] = KDE_ALL_ACTIVITIES_UUID;
 
         p->activities = nstrdup(nulluuid);
 
-- 
2.1.0

Places

File 0001-Make-constants-const-saves-a-few-symbols-in-the-.dat.patch of Package kwindowsystem (Revision 4edcf5b1c19e850a206704563d2ad8f7)

Places