aboutsummaryrefslogtreecommitdiffhomepage
path: root/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'gtk')
-rw-r--r--gtk/Converter.h4
-rw-r--r--gtk/PlatGTK.cxx6
-rw-r--r--gtk/ScintillaGTK.cxx6
-rw-r--r--gtk/ScintillaGTK.h4
-rw-r--r--gtk/ScintillaGTKAccessible.cxx2
-rw-r--r--gtk/ScintillaGTKAccessible.h4
6 files changed, 0 insertions, 26 deletions
diff --git a/gtk/Converter.h b/gtk/Converter.h
index f17949d98..0ef80ae23 100644
--- a/gtk/Converter.h
+++ b/gtk/Converter.h
@@ -6,9 +6,7 @@
#ifndef CONVERTER_H
#define CONVERTER_H
-#ifdef SCI_NAMESPACE
namespace Scintilla {
-#endif
const GIConv iconvhBad = (GIConv)(-1);
const gsize sizeFailure = static_cast<gsize>(-1);
@@ -67,8 +65,6 @@ public:
}
};
-#ifdef SCI_NAMESPACE
}
-#endif
#endif
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index 06926f347..ebedc6e93 100644
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -57,9 +57,7 @@ static GdkWindow *WindowFromWidget(GtkWidget *w) {
#pragma warning(disable: 4505)
#endif
-#ifdef SCI_NAMESPACE
using namespace Scintilla;
-#endif
enum encodingType { singleByte, UTF8, dbcs};
@@ -123,9 +121,7 @@ void Font::Release() {
}
// Required on OS X
-#ifdef SCI_NAMESPACE
namespace Scintilla {
-#endif
// SurfaceID is a cairo_t*
class SurfaceImpl : public Surface {
@@ -187,9 +183,7 @@ public:
void SetUnicodeMode(bool unicodeMode_) override;
void SetDBCSMode(int codePage) override;
};
-#ifdef SCI_NAMESPACE
}
-#endif
const char *CharacterSetID(int characterSet) {
switch (characterSet) {
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 21762464f..48aa30a71 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -105,9 +105,7 @@ static GdkWindow *WindowFromWidget(GtkWidget *w) {
#pragma warning(disable: 4505)
#endif
-#ifdef SCI_NAMESPACE
using namespace Scintilla;
-#endif
static GdkWindow *PWindow(const Window &w) {
GtkWidget *widget = static_cast<GtkWidget *>(w.GetID());
@@ -710,9 +708,7 @@ void ScintillaGTK::StartDrag() {
#endif
}
-#ifdef SCI_NAMESPACE
namespace Scintilla {
-#endif
std::string ConvertText(const char *s, size_t len, const char *charSetDest,
const char *charSetSource, bool transliterations, bool silent) {
// s is not const because of different versions of iconv disagreeing about const
@@ -745,9 +741,7 @@ std::string ConvertText(const char *s, size_t len, const char *charSetDest,
}
return destForm;
}
-#ifdef SCI_NAMESPACE
}
-#endif
// Returns the target converted to UTF8.
// Return the length in bytes.
diff --git a/gtk/ScintillaGTK.h b/gtk/ScintillaGTK.h
index 8255db9c6..07456a689 100644
--- a/gtk/ScintillaGTK.h
+++ b/gtk/ScintillaGTK.h
@@ -6,9 +6,7 @@
#ifndef SCINTILLAGTK_H
#define SCINTILLAGTK_H
-#ifdef SCI_NAMESPACE
namespace Scintilla {
-#endif
class ScintillaGTKAccessible;
@@ -284,8 +282,6 @@ public:
std::string ConvertText(const char *s, size_t len, const char *charSetDest,
const char *charSetSource, bool transliterations, bool silent=false);
-#ifdef SCI_NAMESPACE
}
-#endif
#endif
diff --git a/gtk/ScintillaGTKAccessible.cxx b/gtk/ScintillaGTKAccessible.cxx
index 24ce8a950..05d6b768c 100644
--- a/gtk/ScintillaGTKAccessible.cxx
+++ b/gtk/ScintillaGTKAccessible.cxx
@@ -128,9 +128,7 @@
#include "ScintillaGTK.h"
#include "ScintillaGTKAccessible.h"
-#ifdef SCI_NAMESPACE
using namespace Scintilla;
-#endif
struct ScintillaObjectAccessiblePrivate {
ScintillaGTKAccessible *pscin;
diff --git a/gtk/ScintillaGTKAccessible.h b/gtk/ScintillaGTKAccessible.h
index bb47ddf3e..cfb367f43 100644
--- a/gtk/ScintillaGTKAccessible.h
+++ b/gtk/ScintillaGTKAccessible.h
@@ -6,9 +6,7 @@
#ifndef SCINTILLAGTKACCESSIBLE_H
#define SCINTILLAGTKACCESSIBLE_H
-#ifdef SCI_NAMESPACE
namespace Scintilla {
-#endif
#ifndef ATK_CHECK_VERSION
# define ATK_CHECK_VERSION(x, y, z) 0
@@ -188,9 +186,7 @@ public:
};
};
-#ifdef SCI_NAMESPACE
}
-#endif
#endif /* SCINTILLAGTKACCESSIBLE_H */