unexport/remove unused internal external references

plenty of those, I've grep-ed only for Q_GUI_EXPORT and qt_ prefix

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/global/qglobal.cpp b/src/core/global/qglobal.cpp
index f5036c3..f87d87d 100644 (file)
--- a/src/core/global/qglobal.cpp
+++ b/src/core/global/qglobal.cpp
@@ -506,22 +506,6 @@ QT_BEGIN_NAMESPACE
     Convenience typedef for \c{unsigned char}.
 */
 
-/*!
-    \fn qt_set_sequence_auto_mnemonic(bool on)
-    \relates <QtGlobal>
-
-    Enables automatic mnemonics on Mac if \a on is true; otherwise
-    this feature is disabled.
-
-    Note that this function is only available on Mac where mnemonics
-    are disabled by default.
-
-    To access to this function, use an extern declaration:
-    extern void qt_set_sequence_auto_mnemonic(bool b);
-
-    \sa {QShortcut#mnemonic}{QShortcut}
-*/
-
 /*! \typedef ushort
     \relates <QtGlobal>
 

diff --git a/src/gui/dialogs/qfileinfogatherer.cpp b/src/gui/dialogs/qfileinfogatherer.cpp
index 971269b..e7f6b38 100644 (file)
--- a/src/gui/dialogs/qfileinfogatherer.cpp
+++ b/src/gui/dialogs/qfileinfogatherer.cpp
@@ -43,19 +43,6 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_FILESYSTEMMODEL
 
-#ifdef QT_BUILD_INTERNAL
-static bool fetchedRoot = false;
-Q_AUTOTEST_EXPORT void qt_test_resetFetchedRoot()
-{
-    fetchedRoot = false;
-}
-
-Q_AUTOTEST_EXPORT bool qt_test_isFetchedRoot()
-{
-    return fetchedRoot;
-}
-#endif
-
 /*!
     Creates thread
 */
@@ -242,9 +229,6 @@ void QFileInfoGatherer::getFileInfos(const QString &path, const QStringList &fil
 
     // List drives
     if (path.isEmpty()) {
-#ifdef QT_BUILD_INTERNAL
-        fetchedRoot = true;
-#endif
         QFileInfoList infoList;
         if (files.isEmpty()) {
             infoList << QFileInfo(QDir::rootPath());

diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp
index 5fec188..9f175c5 100644 (file)
--- a/src/gui/image/qpixmap_x11.cpp
+++ b/src/gui/image/qpixmap_x11.cpp
@@ -282,7 +282,6 @@ static int defaultScreen = -1;
  *****************************************************************************/
 
 QAtomicInt qt_pixmap_serial = QAtomicInt(0);
-int Q_GUI_EXPORT qt_x11_preferred_pixmap_depth = 0;
 
 QX11PixmapData::QX11PixmapData(PixelType type)
     : QPixmapData(type, X11Class), hd(0),
@@ -316,10 +315,7 @@ void QX11PixmapData::resize(int width, int height)
         xinfo.setX11Data(xd);
     }
 
-    int dd = xinfo.depth();
-
-    if (qt_x11_preferred_pixmap_depth)
-        dd = qt_x11_preferred_pixmap_depth;
+    const int dd = xinfo.depth();
 
     bool make_null = w <= 0 || h <= 0;                // create null pixmap
     d = (pixelType() == BitmapType ? 1 : dd);
@@ -417,10 +413,7 @@ void QX11PixmapData::fromImage(const QImage &img,
     }
 
     QX11AlphaDetector alphaCheck(&img, flags);
-    int dd = alphaCheck.hasXRenderAndAlpha() ? 32 : xinfo.depth();
-
-    if (qt_x11_preferred_pixmap_depth)
-        dd = qt_x11_preferred_pixmap_depth;
+    const int dd = alphaCheck.hasXRenderAndAlpha() ? 32 : xinfo.depth();
 
     QImage image = img;
 

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 3f4ce64..74602e4 100644 (file)
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -298,41 +298,11 @@ static bool popupGrabOk;
 
 bool qt_sm_blockUserInput = false;                // session management
 
-Q_GUI_EXPORT int qt_xfocusout_grab_counter = 0;
-
-typedef bool(*QX11FilterFunction)(XEvent *event);
-
-Q_GLOBAL_STATIC(QList<QX11FilterFunction>, x11Filters)
-
-Q_GUI_EXPORT void qt_installX11EventFilter(QX11FilterFunction func)
-{
-    Q_ASSERT(func);
-
-    if (QList<QX11FilterFunction> *list = x11Filters())
-        list->append(func);
-}
-
-Q_GUI_EXPORT void qt_removeX11EventFilter(QX11FilterFunction func)
-{
-    Q_ASSERT(func);
-
-    if (QList<QX11FilterFunction> *list = x11Filters())
-        list->removeOne(func);
-}
-
-
 static bool qt_x11EventFilter(XEvent* ev)
 {
     long unused;
     if (qApp->filterEvent(ev, &unused))
         return true;
-    if (const QList<QX11FilterFunction> *list = x11Filters()) {
-        for (QList<QX11FilterFunction>::const_iterator it = list->constBegin(); it != list->constEnd(); ++it) {
-            if ((*it)(ev))
-                return true;
-        }
-    }
-
     return qApp->x11EventFilter(ev);
 }
 
@@ -2330,7 +2300,6 @@ int QApplication::x11ProcessEvent(XEvent* event)
         if (!widget->isWindow())
             break;
         if (event->xfocus.mode == NotifyGrab) {
-            qt_xfocusout_grab_counter++;
             break;
         }
         if (event->xfocus.detail != NotifyAncestor &&

diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 3664755..1d16d98 100644 (file)
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -47,9 +47,6 @@
 
 QT_BEGIN_NAMESPACE
 
-static bool qt_sequence_no_mnemonics = false;
-void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemonics = !b; }
-
 /*!
     \class QKeySequence
     \brief The QKeySequence class encapsulates a key sequence as used
@@ -870,16 +867,10 @@ bool QKeySequence::isEmpty() const
     in English. At the time of writing, Microsoft and Open Group do
     not appear to have issued equivalent recommendations for other
     languages.
-
-    \sa qt_set_sequence_auto_mnemonic()
 */
 QKeySequence QKeySequence::mnemonic(const QString &text)
 {
     QKeySequence ret;
-
-    if(qt_sequence_no_mnemonics)
-        return ret;
-
     bool found = false;
     int p = 0;
     while (p >= 0) {

diff --git a/src/gui/kernel/qshortcut.cpp b/src/gui/kernel/qshortcut.cpp
index 9037d40..e939893 100644 (file)
--- a/src/gui/kernel/qshortcut.cpp
+++ b/src/gui/kernel/qshortcut.cpp
@@ -74,10 +74,7 @@ QT_BEGIN_NAMESPACE
     shown and the character will be underlined. On Windows, shortcuts
     are normally not displayed until the user presses the \gui Alt
     key, but this is a setting the user can change. On Mac, shortcuts
-    are disabled by default. Call qt_set_sequence_auto_mnemonic() to
-    enable them. However, because mnemonic shortcuts do not fit in
-    with Aqua's guidelines, Qt will not show the shortcut character
-    underlined.
+    are disabled by default.
 
     For applications that use menus, it may be more convenient to
     use the convenience functions provided in the QMenu class to

diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index 82a5d4b..6ddece9 100644 (file)
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -758,7 +758,7 @@ const QGradient *QBrush::gradient() const
     return 0;
 }
 
-Q_GUI_EXPORT bool qt_isExtendedRadialGradient(const QBrush &brush)
+static bool qt_isExtendedRadialGradient(const QBrush &brush)
 {
     if (brush.style() == Qt::RadialGradientPattern) {
         const QGradient *g = brush.gradient();

diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index f8ee56f..ab1fe48 100644 (file)
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -955,51 +955,6 @@ void QPaintEngineEx::updateState(const QPaintEngineState &)
     // do nothing...
 }
 
-Q_GUI_EXPORT QPainterPath qt_painterPathFromVectorPath(const QVectorPath &path)
-{
-    const qreal *points = path.points();
-    const QPainterPath::ElementType *types = path.elements();
-
-    QPainterPath p;
-    if (types) {
-        int id = 0;
-        for (int i=0; i<path.elementCount(); ++i) {
-            switch(types[i]) {
-            case QPainterPath::MoveToElement:
-                p.moveTo(QPointF(points[id], points[id+1]));
-                id+=2;
-                break;
-            case QPainterPath::LineToElement:
-                p.lineTo(QPointF(points[id], points[id+1]));
-                id+=2;
-                break;
-            case QPainterPath::CurveToElement: {
-                QPointF p1(points[id], points[id+1]);
-                QPointF p2(points[id+2], points[id+3]);
-                QPointF p3(points[id+4], points[id+5]);
-                p.cubicTo(p1, p2, p3);
-                id+=6;
-                break;
-            }
-            case QPainterPath::CurveToDataElement:
-                ;
-                break;
-            }
-        }
-    } else {
-        p.moveTo(QPointF(points[0], points[1]));
-        int id = 2;
-        for (int i=1; i<path.elementCount(); ++i) {
-            p.lineTo(QPointF(points[id], points[id+1]));
-            id+=2;
-        }
-    }
-    if (path.hints() & QVectorPath::WindingFill)
-        p.setFillRule(Qt::WindingFill);
-
-    return p;
-}
-
 void QPaintEngineEx::drawStaticTextItem(QStaticTextItem *staticTextItem)
 {
     QPainterPath path;

diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 39f203f..7115f75 100644 (file)
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -72,10 +72,10 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const
                                    QTextItem::RenderFlags flags, qreal width,
                                    const QTextCharFormat &charFormat);
 // Helper function to calculate left most position, width and flags for decoration drawing
-Q_GUI_EXPORT void qt_draw_decoration_for_glyphs(QPainter *painter, const glyph_t *glyphArray,
-                                                const QFixedPoint *positions, int glyphCount,
-                                                QFontEngine *fontEngine, const QFont &font,
-                                                const QTextCharFormat &charFormat);
+static void qt_draw_decoration_for_glyphs(QPainter *painter, const glyph_t *glyphArray,
+                                          const QFixedPoint *positions, int glyphCount,
+                                          QFontEngine *fontEngine, const QFont &font,
+                                          const QTextCharFormat &charFormat);
 
 static inline QGradient::CoordinateMode coordinateMode(const QBrush &brush)
 {
@@ -5573,10 +5573,10 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const
     painter->setBrush(oldBrush);
 }
 
-Q_GUI_EXPORT void qt_draw_decoration_for_glyphs(QPainter *painter, const glyph_t *glyphArray,
-                                                const QFixedPoint *positions, int glyphCount,
-                                                QFontEngine *fontEngine, const QFont &font,
-                                                const QTextCharFormat &charFormat)
+static void qt_draw_decoration_for_glyphs(QPainter *painter, const glyph_t *glyphArray,
+                                          const QFixedPoint *positions, int glyphCount,
+                                          QFontEngine *fontEngine, const QFont &font,
+                                          const QTextCharFormat &charFormat)
 {
     if (!(font.underline() || font.strikeOut() || font.overline()))
         return;

diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index b2432dd..6684353 100644 (file)
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -67,15 +67,6 @@ QT_BEGIN_NAMESPACE
 
 #define SMOOTH_SCALABLE 0xffff
 
-bool qt_enable_test_font = false;
-
-static QString styleStringHelper(int weight, QFont::Style style);
-
-Q_AUTOTEST_EXPORT void qt_setQtEnableTestFont(bool value)
-{
-    qt_enable_test_font = value;
-}
-
 static int getFontWeight(const QString &weightString)
 {
     QString s = weightString.toLower();

diff --git a/src/gui/text/qfontdatabase_x11_p.h b/src/gui/text/qfontdatabase_x11_p.h
index 6842640..f342826 100644 (file)
--- a/src/gui/text/qfontdatabase_x11_p.h
+++ b/src/gui/text/qfontdatabase_x11_p.h
@@ -704,6 +704,7 @@ static void loadFontConfig()
 #endif // QT_NO_FONTCONFIG
 
 static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt);
+static QString styleStringHelper(int weight, QFont::Style style);
 
 static void initializeFontDb()
 {
@@ -1175,12 +1176,6 @@ void QFontDatabase::load(const QFontPrivate *d, int script)
         if (!privateDb()->count)
             initializeFontDb();
 
-#ifdef QT_BUILD_INTERNAL
-        if (qt_enable_test_font && req.family == QLatin1String("__Qt__Box__Engine__")) {
-            fe = new QTestFontEngine(req.pixelSize);
-            fe->fontDef = req;
-        } else
-#endif
 #ifndef QT_NO_FONTCONFIG
         if (qt_x11Data->has_fontconfig) {
             fe = loadFc(d, static_cast<QUnicodeTables::Script>(script), req);

diff --git a/src/gui/text/qfontengine_x11.cpp b/src/gui/text/qfontengine_x11.cpp
index 96b986d..5c21954 100644 (file)
--- a/src/gui/text/qfontengine_x11.cpp
+++ b/src/gui/text/qfontengine_x11.cpp
@@ -192,7 +192,7 @@ void QFontEngineMultiFT::loadEngine(int at)
 
 
 
-Q_GUI_EXPORT void qt_x11ft_convert_pattern(FcPattern *pattern, QByteArray *file_name, int *index, bool *antialias)
+static void qt_x11ft_convert_pattern(FcPattern *pattern, QByteArray *file_name, int *index, bool *antialias)
 {
     FcChar8 *fileName;
     FcPatternGetString(pattern, FC_FILE, 0, &fileName);

diff --git a/src/gui/widgets/qabstractbutton.cpp b/src/gui/widgets/qabstractbutton.cpp
index 451c443..94af7ce 100644 (file)
--- a/src/gui/widgets/qabstractbutton.cpp
+++ b/src/gui/widgets/qabstractbutton.cpp
@@ -49,8 +49,6 @@ QT_BEGIN_NAMESPACE
 #define AUTO_REPEAT_DELAY  300
 #define AUTO_REPEAT_INTERVAL 100
 
-Q_GUI_EXPORT extern bool qt_tab_all_widgets;
-
 /*!
     \class QAbstractButton
 

diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp
index 33a8d86..11567b5 100644 (file)
--- a/src/gui/widgets/qmainwindow.cpp
+++ b/src/gui/widgets/qmainwindow.cpp
@@ -31,8 +31,6 @@
 **
 ****************************************************************************/
 
-//#define QT_EXPERIMENTAL_CLIENT_DECORATIONS
-
 #include "qmainwindow.h"
 #include "qmainwindowlayout_p.h"
 
@@ -90,57 +88,11 @@ QMainWindowLayout *qt_mainwindow_layout(const QMainWindow *mainWindow)
     return QMainWindowPrivate::mainWindowLayout(mainWindow);
 }
 
-#ifdef QT_EXPERIMENTAL_CLIENT_DECORATIONS
-Q_GUI_EXPORT void qt_setMainWindowTitleWidget(QMainWindow *mainWindow, Qt::DockWidgetArea area, QWidget *widget)
-{
-    QGridLayout *topLayout = qobject_cast<QGridLayout *>(mainWindow->layout());
-    Q_ASSERT(topLayout);
-
-    int row = 0;
-    int column = 0;
-
-    switch (area) {
-    case Qt::LeftDockWidgetArea:
-        row = 1;
-        column = 0;
-        break;
-    case Qt::TopDockWidgetArea:
-        row = 0;
-        column = 1;
-        break;
-    case Qt::BottomDockWidgetArea:
-        row = 2;
-        column = 1;
-        break;
-    case Qt::RightDockWidgetArea:
-        row = 1;
-        column = 2;
-        break;
-    default:
-        Q_ASSERT_X(false, "qt_setMainWindowTitleWidget", "Unknown area");
-        return;
-    }
-
-    if (QLayoutItem *oldItem = topLayout->itemAtPosition(row, column))
-        delete oldItem->widget();
-    topLayout->addWidget(widget, row, column);
-}
-#endif
-
 void QMainWindowPrivate::init()
 {
     Q_Q(QMainWindow);
 
-#ifdef QT_EXPERIMENTAL_CLIENT_DECORATIONS
-    QGridLayout *topLayout = new QGridLayout(q);
-    topLayout->setContentsMargins(0, 0, 0, 0);
-
-    layout = new QMainWindowLayout(q, topLayout);
-
-    topLayout->addItem(layout, 1, 1);
-#else
     layout = new QMainWindowLayout(q, 0);
-#endif
 
     const int metric = q->style()->pixelMetric(QStyle::PM_ToolBarIconSize, 0, q);
     iconSize = QSize(metric, metric);

diff --git a/src/gui/widgets/qmainwindowlayout.cpp b/src/gui/widgets/qmainwindowlayout.cpp
index 5a74f36..18c11ce 100644 (file)
--- a/src/gui/widgets/qmainwindowlayout.cpp
+++ b/src/gui/widgets/qmainwindowlayout.cpp
@@ -74,8 +74,6 @@ QT_BEGIN_NAMESPACE
 
 static QTextStream qout(stderr, QIODevice::WriteOnly);
 
-static void dumpLayout(QTextStream &qout, const QDockAreaLayoutInfo &layout, QString indent);
-
 static void dumpLayout(QTextStream &qout, const QDockAreaLayoutItem &item, QString indent)
 {
     qout << indent << "QDockAreaLayoutItem: "
@@ -144,13 +142,6 @@ static void dumpLayout(QTextStream &qout, const QDockAreaLayout &layout, QString
 
     qout.flush();
 };
-
-void qt_dumpLayout(QTextStream &qout, QMainWindow *window)
-{
-    QMainWindowLayout *layout = qt_mainwindow_layout(window);
-    dumpLayout(qout, layout->layoutState.dockAreaLayout, QString());
-}
-
 #endif // Q_DEBUG_MAINWINDOW_LAYOUT && !QT_NO_DOCKWIDGET
 
 /******************************************************************************

diff --git a/src/gui/widgets/qmainwindowlayout_p.h b/src/gui/widgets/qmainwindowlayout_p.h
index b965d7d..e4d2e46 100644 (file)
--- a/src/gui/widgets/qmainwindowlayout_p.h
+++ b/src/gui/widgets/qmainwindowlayout_p.h
@@ -63,10 +63,7 @@
 //#define Q_DEBUG_MAINWINDOW_LAYOUT
 
 #if defined(Q_DEBUG_MAINWINDOW_LAYOUT) && !defined(QT_NO_DOCKWIDGET)
-QT_BEGIN_NAMESPACE
-class QTextStream;
-Q_GUI_EXPORT void qt_dumpLayout(QTextStream &qout, QMainWindow *window);
-QT_END_NAMESPACE
+#include "qtextstream.h"
 #endif // Q_DEBUG_MAINWINDOW_LAYOUT && !QT_NO_DOCKWIDGET
 
 QT_BEGIN_NAMESPACE