aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/ClientStore.cpp
diff options
context:
space:
mode:
authorFernando Carvajal <fcarvajal@qindel.com>2016-04-12 11:52:22 +0200
committerFernando Carvajal <fcarvajal@qindel.com>2016-04-12 12:07:53 +0200
commita9be6f59105b7cf29bb799556274dc2c3b3d2af8 (patch)
tree555bfeba04b21dc26df16ee5c26a3ec798d02584 /nxcomp/ClientStore.cpp
parent2ffe52c5ecb7cf6af111c685eee7f8fcfd1139a9 (diff)
downloadnx-libs-a9be6f59105b7cf29bb799556274dc2c3b3d2af8.tar.gz
nx-libs-a9be6f59105b7cf29bb799556274dc2c3b3d2af8.tar.bz2
nx-libs-a9be6f59105b7cf29bb799556274dc2c3b3d2af8.zip
Remove compatibility code for nxcomp before 3.5.0
As a part of nxcomp's clean-up process, compatibility with old protocol versions has been set now at 3.5.0. This commit removes compatibility code from nxcomp so the minimum supported version changes from 1.5.0 (protocol step 6) to 3.5.0 (protocol step 10). At this moment the removal is not complete and it will be followed by some other commits, in order to get rid of several components and files that are no longer used as they were only needed to work with old protocol versions. Refs: ArcticaProject/nx-libs#108
Diffstat (limited to 'nxcomp/ClientStore.cpp')
-rw-r--r--nxcomp/ClientStore.cpp24
1 files changed, 5 insertions, 19 deletions
diff --git a/nxcomp/ClientStore.cpp b/nxcomp/ClientStore.cpp
index be0e892b4..d56019258 100644
--- a/nxcomp/ClientStore.cpp
+++ b/nxcomp/ClientStore.cpp
@@ -54,11 +54,6 @@
#include "PutPackedImage.h"
#include "GenericRequest.h"
-#include "ChangeGCCompat.h"
-#include "CreatePixmapCompat.h"
-#include "SetUnpackColormapCompat.h"
-#include "SetUnpackAlphaCompat.h"
-
//
// Set the verbosity level.
//
@@ -111,20 +106,11 @@ ClientStore::ClientStore(StaticCompressor *compressor)
requests_[X_NXSetUnpackGeometry] = new SetUnpackGeometryStore(compressor);
requests_[X_NXPutPackedImage] = new PutPackedImageStore(compressor);
- if (control -> isProtoStep7() == 1)
- {
- requests_[X_ChangeGC] = new ChangeGCStore();
- requests_[X_CreatePixmap] = new CreatePixmapStore();
- requests_[X_NXSetUnpackColormap] = new SetUnpackColormapStore(compressor);
- requests_[X_NXSetUnpackAlpha] = new SetUnpackAlphaStore(compressor);
- }
- else
- {
- requests_[X_ChangeGC] = new ChangeGCCompatStore();
- requests_[X_CreatePixmap] = new CreatePixmapCompatStore();
- requests_[X_NXSetUnpackColormap] = new SetUnpackColormapCompatStore(compressor);
- requests_[X_NXSetUnpackAlpha] = new SetUnpackAlphaCompatStore(compressor);
- }
+ // Since ProtoStep7 (#issue 108)
+ requests_[X_ChangeGC] = new ChangeGCStore();
+ requests_[X_CreatePixmap] = new CreatePixmapStore();
+ requests_[X_NXSetUnpackColormap] = new SetUnpackColormapStore(compressor);
+ requests_[X_NXSetUnpackAlpha] = new SetUnpackAlphaStore(compressor);
for (int i = 0; i < CHANNEL_STORE_RESOURCE_LIMIT; i++)
{