Removed qocoa so we can replace it with a subtree.

src/gui/qocoa/CMakeLists.txt

@@ -1,50 +0,0 @@
-project(Qocoa)
-cmake_minimum_required(VERSION 2.8)
-
-#find_package(Qt4 COMPONENTS QtMain QtCore QtGui REQUIRED)
-#include(UseQt4)
-
-set(SOURCES
-    #main.cpp
-    #gallery.cpp
-)
-
-set(HEADERS
-	#gallery.h
-    qsearchfield.h
-    qbutton.h
-    qprogressindicatorspinning.h
-)
-
-qt4_wrap_cpp(MOC_SOURCES ${HEADERS})
-
-if(APPLE)
-    list(APPEND SOURCES
-        qsearchfield_mac.mm
-        qbutton_mac.mm
-        qprogressindicatorspinning_mac.mm
-    )
-else()
-    list(APPEND SOURCES
-        qsearchfield_nonmac.cpp
-        qbutton_nonmac.cpp
-        qprogressindicatorspinning_nonmac.cpp
-    )
-    set(RESOURCES
-        qsearchfield_nonmac.qrc
-        qprogressindicatorspinning_nonmac.qrc
-    )
-    qt4_add_resources(RESOURCES_SOURCES ${RESOURCES})
-endif()
-
-#add_executable(Qocoa
-#    WIN32 MACOSX_BUNDLE
-#    ${SOURCES} ${MOC_SOURCES} ${RESOURCES_SOURCES}
-#)
-#target_link_libraries(Qocoa ${QT_LIBRARIES})
-
-add_library (Qocoa STATIC ${SOURCES} ${MOC_SOURCES} ${HEADERS} ${RESOURCES_SOURCES})
-
-#if(APPLE)
-#    set_target_properties(Qocoa PROPERTIES LINK_FLAGS "-framework Foundation -framework AppKit")
-#endif()

src/gui/qocoa/LICENSE.txt

@@ -1,19 +0,0 @@
-Copyright (C) 2011 by Mike McQuaid
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

src/gui/qocoa/Qocoa.pro

@@ -1,17 +0,0 @@
-SOURCES += main.cpp\
-           gallery.cpp \
-
-HEADERS += gallery.h \
-           qocoa_mac.h \
-           qsearchfield.h \
-           qbutton.h \
-           qprogressindicatorspinning.h \
-
-mac {
-    OBJECTIVE_SOURCES += qsearchfield_mac.mm qbutton_mac.mm qprogressindicatorspinning_mac.mm
-    LIBS += -framework Foundation -framework Appkit
-    QMAKE_CFLAGS += -mmacosx-version-min=10.6
-} else {
-    SOURCES += qsearchfield_nonmac.cpp qbutton_nonmac.cpp qprogressindicatorspinning_nonmac.cpp
-    RESOURCES += qsearchfield_nonmac.qrc qprogressindicatorspinning_nonmac.qrc
-}

src/gui/qocoa/README.md

@@ -1,36 +0,0 @@
-# Qocoa
-Qocoa is a collection of Qt wrappers for OSX's Cocoa widgets.
-
-## Features
-- basic fallback to sensible Qt types on non-OSX platforms
-- shared class headers which expose no implementation details
-- typical Qt signal/slot-based API
-- trivial to import into projects (class header/implementation, [single shared global header](https://github.com/mikemcquaid/Qocoa/blob/master/qocoa_mac.h))
-
-## Building
-```
-git clone git://github.com/mikemcquaid/Qocoa.git
-cd Qocoa
-qmake # or cmake .
-make
-```
-
-## Status
-Qocoa classes are currently provided for NSButton, a spinning NSProgressIndicator and NSSearchField. There is a [TODO list](https://github.com/mikemcquaid/Qocoa/blob/master/TODO.md) for classes I hope to implement.
-
-## Usage
-For each class you want to use copy the [`qocoa_mac.h`](https://github.com/mikemcquaid/Qocoa/blob/master/qocoa_mac.h), `$CLASS.h`, `$CLASS_mac.*` and `$CLASS_nonmac.*` files into your source tree and add them to your buildsystem. Examples are provided for [CMake](https://github.com/mikemcquaid/Qocoa/blob/master/CMakeLists.txt) and [QMake](https://github.com/mikemcquaid/Qocoa/blob/master/Qocoa.pro).
-
-## Contact
-[Mike McQuaid](mailto:mike@mikemcquaid.com)
-
-## License
-Qocoa is licensed under the [MIT License](http://en.wikipedia.org/wiki/MIT_License).
-The full license text is available in [LICENSE.txt](https://github.com/mikemcquaid/Qocoa/blob/master/LICENSE.txt).
-
-Magnifier and EditClear icons taken from [QtCreator](http://qt-project.org/), licensed under [LGPL](http://www.gnu.org/copyleft/lesser.html).
-
-Other icons are taken from the [Oxygen Project](http://www.oxygen-icons.org/) and are licensed under the [Creative Commons Attribution-ShareAlike 3.0 License](http://creativecommons.org/licenses/by-sa/3.0/).
-
-## Gallery
-![Qocoa Gallery](https://github.com/mikemcquaid/Qocoa/raw/master/gallery.png)

src/gui/qocoa/TODO.md

@@ -1,13 +0,0 @@
-Widgets I hope to implement (or at least investigate):
-
-- NSTokenField
-- NSSegmentedControl
-- NSLevelIndicator
-- NSPathControl
-- NSSlider (Circular)
-- NSSplitView
-- NSTextFinder
-- NSOutlineView in an NSScrollView (Source List)
-- NSDrawer
-- PDFView
-- WebView

src/gui/qocoa/gallery.cpp

@@ -1,75 +0,0 @@
-#include "gallery.h"
-
-#include <QVBoxLayout>
-
-#include "qsearchfield.h"
-#include "qbutton.h"
-#include "qprogressindicatorspinning.h"
-
-Gallery::Gallery(QWidget *parent) : QWidget(parent)
-{
-    setWindowTitle("Qocoa Gallery");
-    QVBoxLayout *layout = new QVBoxLayout(this);
-
-    QSearchField *searchField = new QSearchField(this);
-    layout->addWidget(searchField);
-
-    QSearchField *searchFieldPlaceholder = new QSearchField(this);
-    searchFieldPlaceholder->setPlaceholderText("Placeholder text");
-    layout->addWidget(searchFieldPlaceholder);
-
-    QButton *roundedButton = new QButton(this, QButton::Rounded);
-    roundedButton->setText("Button");
-    layout->addWidget(roundedButton);
-
-    QButton *regularSquareButton = new QButton(this, QButton::RegularSquare);
-    regularSquareButton->setText("Button");
-    layout->addWidget(regularSquareButton);
-
-    QButton *disclosureButton = new QButton(this, QButton::Disclosure);
-    layout->addWidget(disclosureButton);
-
-    QButton *shadowlessSquareButton = new QButton(this, QButton::ShadowlessSquare);
-    shadowlessSquareButton->setText("Button");
-    layout->addWidget(shadowlessSquareButton);
-
-    QButton *circularButton = new QButton(this, QButton::Circular);
-    layout->addWidget(circularButton);
-
-    QButton *textureSquareButton = new QButton(this, QButton::TexturedSquare);
-    textureSquareButton->setText("Textured Button");
-    layout->addWidget(textureSquareButton);
-
-    QButton *helpButton = new QButton(this, QButton::HelpButton);
-    layout->addWidget(helpButton);
-
-    QButton *smallSquareButton = new QButton(this, QButton::SmallSquare);
-    smallSquareButton->setText("Gradient Button");
-    layout->addWidget(smallSquareButton);
-
-    QButton *texturedRoundedButton = new QButton(this, QButton::TexturedRounded);
-    texturedRoundedButton->setText("Round Textured");
-    layout->addWidget(texturedRoundedButton);
-
-    QButton *roundedRectangleButton = new QButton(this, QButton::RoundRect);
-    roundedRectangleButton->setText("Rounded Rect Button");
-    layout->addWidget(roundedRectangleButton);
-
-    QButton *recessedButton = new QButton(this, QButton::Recessed);
-    recessedButton->setText("Recessed Button");
-    layout->addWidget(recessedButton);
-
-    QButton *roundedDisclosureButton = new QButton(this, QButton::RoundedDisclosure);
-    layout->addWidget(roundedDisclosureButton);
-
-#ifdef __MAC_10_7
-    QButton *inlineButton = new QButton(this, QButton::Inline);
-    inlineButton->setText("Inline Button");
-    layout->addWidget(inlineButton);
-#endif
-
-
-    QProgressIndicatorSpinning *progressIndicatorSpinning = new QProgressIndicatorSpinning(this);
-    progressIndicatorSpinning->animate();
-    layout->addWidget(progressIndicatorSpinning);
-}

src/gui/qocoa/gallery.h

@@ -1,14 +0,0 @@
-#ifndef GALLERY_H
-#define GALLERY_H
-
-#include <QWidget>
-
-class Gallery : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit Gallery(QWidget *parent = 0);
-};
-
-#endif // WIDGET_H

src/gui/qocoa/main.cpp

@@ -1,12 +0,0 @@
-#include <QtGui/QApplication>
-#include "gallery.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication application(argc, argv);
-
-    Gallery gallery;
-    gallery.show();
-
-    return application.exec();
-}

src/gui/qocoa/qbutton.h

@@ -1,49 +0,0 @@
-#ifndef QBUTTON_H
-#define QBUTTON_H
-
-#include <QtGui/QWidget>
-#include <QtCore/QPointer>
-
-class QButtonPrivate;
-class QButton : public QWidget
-{
-    Q_OBJECT
-public:
-    // Matches NSBezelStyle
-    enum BezelStyle {
-       Rounded           = 1,
-       RegularSquare     = 2,
-       Disclosure        = 5,
-       ShadowlessSquare  = 6,
-       Circular          = 7,
-       TexturedSquare    = 8,
-       HelpButton        = 9,
-       SmallSquare       = 10,
-       TexturedRounded   = 11,
-       RoundRect         = 12,
-       Recessed          = 13,
-       RoundedDisclosure = 14,
-#ifdef __MAC_10_7
-       Inline            = 15
-#endif
-    };
-
-    explicit QButton(QWidget *parent, BezelStyle bezelStyle = Rounded);
-
-public Q_SLOTS:
-    void setText(const QString &text);
-    void setImage(const QPixmap &image);
-    void setChecked(bool checked);
-
-public:
-    void setCheckable(bool checkable);
-    bool isChecked();
-
-Q_SIGNALS:
-    void clicked(bool checked = false);
-
-private:
-    friend class QButtonPrivate;
-    QPointer<QButtonPrivate> pimpl;
-};
-#endif // QBUTTON_H

src/gui/qocoa/qbutton_mac.mm

@@ -1,229 +0,0 @@
-/*
-Copyright (C) 2011 by Mike McQuaid
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#include "qbutton.h"
-
-#include "qocoa_mac.h"
-
-#import "Foundation/NSAutoreleasePool.h"
-#import "AppKit/NSButton.h"
-#import "AppKit/NSFont.h"
-
-class QButtonPrivate : public QObject
-{
-public:
-    QButtonPrivate(QButton *qButton, NSButton *nsButton, QButton::BezelStyle bezelStyle)
-        : QObject(qButton), qButton(qButton), nsButton(nsButton)
-    {
-        switch(bezelStyle) {
-            case QButton::Disclosure:
-            case QButton::Circular:
-#ifdef __MAC_10_7
-            case QButton::Inline:
-#endif
-            case QButton::RoundedDisclosure:
-            case QButton::HelpButton:
-                [nsButton setTitle:@""];
-            default:
-                break;
-        }
-
-        NSFont* font = 0;
-        switch(bezelStyle) {
-            case QButton::RoundRect:
-                font = [NSFont fontWithName:@"Lucida Grande" size:12];
-                break;
-
-            case QButton::Recessed:
-                font = [NSFont fontWithName:@"Lucida Grande Bold" size:12];
-                break;
-
-#ifdef __MAC_10_7
-            case QButton::Inline:
-                font = [NSFont boldSystemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]];
-                break;
-#endif
-
-            default:
-                font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSRegularControlSize]];
-                break;
-        }
-        [nsButton setFont:font];
-
-        switch(bezelStyle) {
-            case QButton::Rounded:
-                qButton->setMinimumWidth(40);
-                qButton->setFixedHeight(24);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-                break;
-            case QButton::RegularSquare:
-            case QButton::TexturedSquare:
-                qButton->setMinimumSize(14, 23);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-                break;
-            case QButton::ShadowlessSquare:
-                qButton->setMinimumSize(5, 25);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-                break;
-            case QButton::SmallSquare:
-                qButton->setMinimumSize(4, 21);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-                break;
-            case QButton::TexturedRounded:
-                qButton->setMinimumSize(10, 22);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-                break;
-            case QButton::RoundRect:
-            case QButton::Recessed:
-                qButton->setMinimumWidth(16);
-                qButton->setFixedHeight(18);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-                break;
-            case QButton::Disclosure:
-                qButton->setMinimumWidth(13);
-                qButton->setFixedHeight(13);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-                break;
-            case QButton::Circular:
-                qButton->setMinimumSize(16, 16);
-                qButton->setMaximumHeight(40);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-                break;
-            case QButton::HelpButton:
-            case QButton::RoundedDisclosure:
-                qButton->setMinimumWidth(22);
-                qButton->setFixedHeight(22);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-                break;
-#ifdef __MAC_10_7
-            case QButton::Inline:
-                qButton->setMinimumWidth(10);
-                qButton->setFixedHeight(16);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-                break;
-#endif
-        }
-
-        switch(bezelStyle) {
-            case QButton::Recessed:
-                [nsButton setButtonType:NSPushOnPushOffButton];
-            case QButton::Disclosure:
-                [nsButton setButtonType:NSOnOffButton];
-            default:
-                [nsButton setButtonType:NSMomentaryPushInButton];
-        }
-
-        [nsButton setBezelStyle:bezelStyle];
-    }
-
-    void clicked()
-    {
-        Q_EMIT qButton->clicked(qButton->isChecked());
-    }
-
-    ~QButtonPrivate() {
-        [[nsButton target] release];
-        [nsButton setTarget:nil];
-    }
-
-    QButton *qButton;
-    NSButton *nsButton;
-};
-
-@interface QButtonTarget : NSObject
-{
-@public
-    QPointer<QButtonPrivate> pimpl;
-}
--(void)clicked;
-@end
-
-@implementation QButtonTarget
--(void)clicked {
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        pimpl->clicked();
-}
-@end
-
-QButton::QButton(QWidget *parent, BezelStyle bezelStyle) : QWidget(parent)
-{
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
-    NSButton *button = [[NSButton alloc] init];
-    pimpl = new QButtonPrivate(this, button, bezelStyle);
-
-    QButtonTarget *target = [[QButtonTarget alloc] init];
-    target->pimpl = pimpl;
-    [button setTarget:target];
-
-    [button setAction:@selector(clicked)];
-
-    setupLayout(button, this);
-
-    [button release];
-
-    [pool drain];
-}
-
-void QButton::setText(const QString &text)
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    [pimpl->nsButton setTitle:fromQString(text)];
-    [pool drain];
-}
-
-void QButton::setImage(const QPixmap &image)
-{
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        [pimpl->nsButton setImage:fromQPixmap(image)];
-}
-
-void QButton::setChecked(bool checked)
-{
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        [pimpl->nsButton setState:checked];
-}
-
-void QButton::setCheckable(bool checkable)
-{
-    const NSInteger cellMask = checkable ? NSChangeBackgroundCellMask : NSNoCellMask;
-
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        [[pimpl->nsButton cell] setShowsStateBy:cellMask];
-}
-
-bool QButton::isChecked()
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return false;
-
-    return [pimpl->nsButton state];
-}

src/gui/qocoa/qbutton_nonmac.cpp

@@ -1,89 +0,0 @@
-/*
-Copyright (C) 2011 by Mike McQuaid
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#include "qbutton.h"
-
-#include <QtGui/QToolBar>
-#include <QtGui/QToolButton>
-#include <QtGui/QPushButton>
-#include <QtGui/QVBoxLayout>
-
-class QButtonPrivate : public QObject
-{
-public:
-    QButtonPrivate(QButton *button, QAbstractButton *abstractButton)
-        : QObject(button), abstractButton(abstractButton) {}
-    QPointer<QAbstractButton> abstractButton;
-};
-
-QButton::QButton(QWidget *parent, BezelStyle) : QWidget(parent)
-{
-    QAbstractButton *button = 0;
-    if (qobject_cast<QToolBar*>(parent))
-        button = new QToolButton(this);
-    else
-        button = new QPushButton(this);
-    connect(button, SIGNAL(clicked()),
-            this, SIGNAL(clicked()));
-    pimpl = new QButtonPrivate(this, button);
-
-    QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setMargin(0);
-    layout->addWidget(button);
-}
-
-void QButton::setText(const QString &text)
-{
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        pimpl->abstractButton->setText(text);
-}
-
-void QButton::setImage(const QPixmap &image)
-{
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        pimpl->abstractButton->setIcon(image);
-}
-
-void QButton::setChecked(bool checked)
-{
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        pimpl->abstractButton->setChecked(checked);
-}
-
-void QButton::setCheckable(bool checkable)
-{
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        pimpl->abstractButton->setCheckable(checkable);
-}
-
-bool QButton::isChecked()
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return false;
-
-    return pimpl->abstractButton->isChecked();
-}

src/gui/qocoa/qocoa_mac.h

@@ -1,54 +0,0 @@
-/*
-Copyright (C) 2011 by Mike McQuaid
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#include <Foundation/NSString.h>
-#include <QtCore/QString>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QMacCocoaViewContainer>
-
-static inline NSString* fromQString(const QString &string)
-{
-    const QByteArray utf8 = string.toUtf8();
-    const char* cString = utf8.constData();
-    return [[NSString alloc] initWithUTF8String:cString];
-}
-
-static inline QString toQString(NSString *string)
-{
-    if (!string)
-        return QString();
-    return QString::fromUtf8([string UTF8String]);
-}
-
-static inline NSImage* fromQPixmap(const QPixmap &pixmap)
-{
-    CGImageRef cgImage = pixmap.toMacCGImageRef();
-    return [[NSImage alloc] initWithCGImage:cgImage size:NSZeroSize];
-}
-
-static inline void setupLayout(void *cocoaView, QWidget *parent)
-{
-    parent->setAttribute(Qt::WA_NativeWindow);
-    QVBoxLayout *layout = new QVBoxLayout(parent);
-    layout->setMargin(0);
-    layout->addWidget(new QMacCocoaViewContainer(cocoaView, parent));
-}

src/gui/qocoa/qprogressindicatorspinning.h

@@ -1,29 +0,0 @@
-#ifndef QPROGRESSINDICATORSPINNING_H
-#define QPROGRESSINDICATORSPINNING_H
-
-#include <QtGui/QWidget>
-#include <QtCore/QPointer>
-
-class QProgressIndicatorSpinningPrivate;
-class QProgressIndicatorSpinning : public QWidget
-{
-    Q_OBJECT
-public:
-    // Matches NSProgressIndicatorThickness
-    enum Thickness {
-       Default = 14,
-       Small   = 10,
-       Large   = 18,
-       Aqua    = 12
-    };
-
-    explicit QProgressIndicatorSpinning(QWidget *parent,
-                                        Thickness thickness = Default);
-public Q_SLOTS:
-    void animate(bool animate = true);
-private:
-    friend class QProgressIndicatorSpinningPrivate;
-    QPointer<QProgressIndicatorSpinningPrivate> pimpl;
-};
-
-#endif // QPROGRESSINDICATORSPINNING_H

src/gui/qocoa/qprogressindicatorspinning_mac.mm

@@ -1,70 +0,0 @@
-/*
-Copyright (C) 2011 by Mike McQuaid
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#include "qprogressindicatorspinning.h"
-
-#include "qocoa_mac.h"
-
-#import "Foundation/NSAutoreleasePool.h"
-#import "AppKit/NSProgressIndicator.h"
-
-class QProgressIndicatorSpinningPrivate : public QObject
-{
-public:
-    QProgressIndicatorSpinningPrivate(QProgressIndicatorSpinning *qProgressIndicatorSpinning,
-                                      NSProgressIndicator *nsProgressIndicator)
-        : QObject(qProgressIndicatorSpinning), nsProgressIndicator(nsProgressIndicator) {}
-
-    NSProgressIndicator *nsProgressIndicator;
-};
-
-QProgressIndicatorSpinning::QProgressIndicatorSpinning(QWidget *parent,
-                                                       Thickness thickness)
-    : QWidget(parent)
-{
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
-    NSProgressIndicator *progress = [[NSProgressIndicator alloc] init];
-    [progress setStyle:NSProgressIndicatorSpinningStyle];
-
-    pimpl = new QProgressIndicatorSpinningPrivate(this, progress);
-
-    setupLayout(progress, this);
-
-    setFixedSize(thickness, thickness);
-
-    [progress release];
-
-    [pool drain];
-}
-
-void QProgressIndicatorSpinning::animate(bool animate)
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    if (animate)
-        [pimpl->nsProgressIndicator startAnimation:nil];
-    else
-        [pimpl->nsProgressIndicator stopAnimation:nil];
-}

src/gui/qocoa/qprogressindicatorspinning_nonmac.cpp

@@ -1,86 +0,0 @@
-/*
-Copyright (C) 2011 by Mike McQuaid
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#include "qprogressindicatorspinning.h"
-
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QMovie>
-#include <QtGui/QLabel>
-
-class QProgressIndicatorSpinningPrivate : public QObject
-{
-public:
-    QProgressIndicatorSpinningPrivate(QProgressIndicatorSpinning *qProgressIndicatorSpinning,
-                                      QMovie *movie)
-        : QObject(qProgressIndicatorSpinning), movie(movie) {}
-
-    QPointer<QMovie> movie;
-};
-
-struct QProgressIndicatorSpinningResources
-{
-#ifndef Q_OS_MAC
-    QProgressIndicatorSpinningResources() {
-        Q_INIT_RESOURCE(qprogressindicatorspinning_nonmac);
-    }
-    ~QProgressIndicatorSpinningResources() {
-        Q_CLEANUP_RESOURCE(qprogressindicatorspinning_nonmac);
-    }
-#endif
-};
-
-QProgressIndicatorSpinning::QProgressIndicatorSpinning(QWidget *parent,
-                                                       Thickness thickness)
-    : QWidget(parent)
-{
-    static QProgressIndicatorSpinningResources resources;
-
-    QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setMargin(0);
-
-    QSize size(thickness, thickness);
-    QMovie *movie = new QMovie(this);
-    movie->setFileName(":/Qocoa/qprogressindicatorspinning_nonmac.gif");
-    movie->setScaledSize(size);
-    // Roughly match OSX speed.
-    movie->setSpeed(200);
-    pimpl = new QProgressIndicatorSpinningPrivate(this, movie);
-
-    QLabel *label = new QLabel(this);
-    label->setMovie(movie);
-
-    layout->addWidget(label);
-    setFixedSize(size);
-}
-
-
-void QProgressIndicatorSpinning::animate(bool animate)
-{
-    Q_ASSERT(pimpl && pimpl->movie);
-    if (!(pimpl && pimpl->movie))
-        return;
-
-    if (animate)
-        pimpl->movie->start();
-    else
-        pimpl->movie->stop();
-}

src/gui/qocoa/qprogressindicatorspinning_nonmac.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/Qocoa">
-        <file>qprogressindicatorspinning_nonmac.gif</file>
-    </qresource>
-</RCC>

src/gui/qocoa/qsearchfield.h

@@ -1,48 +0,0 @@
-#ifndef QSEARCHFIELD_H
-#define QSEARCHFIELD_H
-
-#include <QtGui/QWidget>
-#include <QtCore/QPointer>
-#include <QtGui/QMenu>
-
-class QSearchFieldPrivate;
-class QSearchField : public QWidget
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged USER true);
-    Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText);
-
-public:
-    explicit QSearchField(QWidget *parent);
-
-    QString text() const;
-    QString placeholderText() const;
-    void setFocus(Qt::FocusReason);
-    void setMenu(QMenu *menu);
-
-public Q_SLOTS:
-    void setText(const QString &text);
-    void setPlaceholderText(const QString &text);
-    void clear();
-    void selectAll();
-    void setFocus();
-
-Q_SIGNALS:
-    void textChanged(const QString &text);
-    void editingFinished();
-    void returnPressed();
-
-private Q_SLOTS:
-    void popupMenu();
-
-protected:
-    void changeEvent(QEvent*);
-    void resizeEvent(QResizeEvent*);
-
-private:
-    friend class QSearchFieldPrivate;
-    QPointer <QSearchFieldPrivate> pimpl;
-};
-
-#endif // QSEARCHFIELD_H

src/gui/qocoa/qsearchfield_mac.mm

@@ -1,257 +0,0 @@
-/*
-Copyright (C) 2011 by Mike McQuaid
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#include "qsearchfield.h"
-
-#include "qocoa_mac.h"
-
-#import "Foundation/NSAutoreleasePool.h"
-#import "Foundation/NSNotification.h"
-#import "AppKit/NSSearchField.h"
-
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-
-#define KEYCODE_A 0
-#define KEYCODE_X 7
-#define KEYCODE_C 8
-#define KEYCODE_V 9
-
-class QSearchFieldPrivate : public QObject
-{
-public:
-    QSearchFieldPrivate(QSearchField *qSearchField, NSSearchField *nsSearchField)
-        : QObject(qSearchField), qSearchField(qSearchField), nsSearchField(nsSearchField) {}
-
-    void textDidChange(const QString &text)
-    {
-        if (qSearchField)
-            Q_EMIT qSearchField->textChanged(text);
-    }
-
-    void textDidEndEditing()
-    {
-        if (qSearchField)
-            Q_EMIT qSearchField->editingFinished();
-    }
-
-    void returnPressed()
-    {
-        if (qSearchField)
-            Q_EMIT qSearchField->returnPressed();
-    }
-
-    QPointer<QSearchField> qSearchField;
-    NSSearchField *nsSearchField;
-};
-
-@interface QSearchFieldDelegate : NSObject<NSTextFieldDelegate>
-{
-@public
-    QPointer<QSearchFieldPrivate> pimpl;
-}
--(void)controlTextDidChange:(NSNotification*)notification;
--(void)controlTextDidEndEditing:(NSNotification*)notification;
-@end
-
-@implementation QSearchFieldDelegate
--(void)controlTextDidChange:(NSNotification*)notification {
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        pimpl->textDidChange(toQString([[notification object] stringValue]));
-}
-
--(void)controlTextDidEndEditing:(NSNotification*)notification {
-    Q_UNUSED(notification);
-    // No Q_ASSERT here as it is called on destruction.
-    if (pimpl)
-        pimpl->textDidEndEditing();
-
-    if ([[[notification userInfo] objectForKey:@"NSTextMovement"] intValue] == NSReturnTextMovement)
-        pimpl->returnPressed();
-}
-@end
-
-@interface QocoaSearchField : NSSearchField
--(BOOL)performKeyEquivalent:(NSEvent*)event;
-@end
-
-@implementation QocoaSearchField
--(BOOL)performKeyEquivalent:(NSEvent*)event {
-    if ([event type] == NSKeyDown && [event modifierFlags] & NSCommandKeyMask)
-    {
-        const unsigned short keyCode = [event keyCode];
-        if (keyCode == KEYCODE_A)
-        {
-            [self performSelector:@selector(selectText:)];
-            return YES;
-        }
-        else if (keyCode == KEYCODE_C)
-        {
-            QClipboard* clipboard = QApplication::clipboard();
-            clipboard->setText(toQString([self stringValue]));
-            return YES;
-        }
-        else if (keyCode == KEYCODE_V)
-        {
-            QClipboard* clipboard = QApplication::clipboard();
-            [self setStringValue:fromQString(clipboard->text())];
-            return YES;
-        }
-        else if (keyCode == KEYCODE_X)
-        {
-            QClipboard* clipboard = QApplication::clipboard();
-            clipboard->setText(toQString([self stringValue]));
-            [self setStringValue:@""];
-            return YES;
-        }
-    }
-
-    return NO;
-}
-@end
-
-QSearchField::QSearchField(QWidget *parent) : QWidget(parent)
-{
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
-    NSSearchField *search = [[QocoaSearchField alloc] init];
-
-    QSearchFieldDelegate *delegate = [[QSearchFieldDelegate alloc] init];
-    pimpl = delegate->pimpl = new QSearchFieldPrivate(this, search);
-    [search setDelegate:delegate];
-
-    setupLayout(search, this);
-
-    setFixedHeight(24);
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-
-    [search release];
-
-    [pool drain];
-}
-
-void QSearchField::setMenu(QMenu *menu)
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    NSMenu *nsMenu = menu->macMenu();
-    [[pimpl->nsSearchField cell] setSearchMenuTemplate:nsMenu];
-}
-
-void QSearchField::popupMenu()
-{
-}
-
-void QSearchField::setText(const QString &text)
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    [pimpl->nsSearchField setStringValue:fromQString(text)];
-    [pool drain];
-}
-
-void QSearchField::setPlaceholderText(const QString &text)
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    [[pimpl->nsSearchField cell] setPlaceholderString:fromQString(text)];
-    [pool drain];
-}
-
-void QSearchField::clear()
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    [pimpl->nsSearchField setStringValue:@""];
-    Q_EMIT textChanged(QString());
-}
-
-void QSearchField::selectAll()
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    [pimpl->nsSearchField performSelector:@selector(selectText:)];
-}
-
-QString QSearchField::text() const
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return QString();
-
-    return toQString([pimpl->nsSearchField stringValue]);
-}
-
-QString QSearchField::placeholderText() const
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return QString();
-
-    return toQString([[pimpl->nsSearchField cell] placeholderString]);
-}
-
-void QSearchField::setFocus(Qt::FocusReason)
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    if ([pimpl->nsSearchField acceptsFirstResponder])
-        [[pimpl->nsSearchField window] makeFirstResponder: pimpl->nsSearchField];
-}
-
-void QSearchField::setFocus()
-{
-    setFocus(Qt::OtherFocusReason);
-}
-
-void QSearchField::changeEvent(QEvent* event)
-{
-    if (event->type() == QEvent::EnabledChange) {
-        Q_ASSERT(pimpl);
-        if (!pimpl)
-            return;
-
-        const bool enabled = isEnabled();
-		[pimpl->nsSearchField setEnabled: enabled];
-    }
-    QWidget::changeEvent(event);
-}
-
-void QSearchField::resizeEvent(QResizeEvent *resizeEvent)
-{
-    QWidget::resizeEvent(resizeEvent);
-}

src/gui/qocoa/qsearchfield_nonmac.cpp

@@ -1,270 +0,0 @@
-/*
-Copyright (C) 2011 by Mike McQuaid
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#include "qsearchfield.h"
-
-#include <QtGui/QLineEdit>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QToolButton>
-#include <QtGui/QStyle>
-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
-
-#include <QtCore/QDir>
-#include <QtCore/QDebug>
-
-class QSearchFieldPrivate : public QObject
-{
-public:
-    QSearchFieldPrivate(QSearchField *searchField, QLineEdit *lineEdit, QToolButton *clearButton, QToolButton *searchButton)
-        : QObject(searchField), lineEdit(lineEdit), clearButton(clearButton), searchButton(searchButton) {}
-
-    int lineEditFrameWidth() const {
-        return lineEdit->style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
-    }
-
-    int clearButtonPaddedWidth() const {
-        return clearButton->width() + lineEditFrameWidth() * 2;
-    }
-
-    int clearButtonPaddedHeight() const {
-        return clearButton->height() + lineEditFrameWidth() * 2;
-    }
-
-    int searchButtonPaddedWidth() const {
-        return searchButton->width() + lineEditFrameWidth() * 2;
-    }
-
-    int searchButtonPaddedHeight() const {
-        return searchButton->height() + lineEditFrameWidth() * 2;
-    }
-
-    QPointer<QLineEdit> lineEdit;
-    QPointer<QToolButton> clearButton;
-    QPointer<QToolButton> searchButton;
-    QPointer<QMenu> searchMenu;
-};
-
-struct QSearchFieldResources
-{
-#ifndef Q_OS_MAC
-    QSearchFieldResources() {
-        Q_INIT_RESOURCE(qsearchfield_nonmac);
-    }
-    ~QSearchFieldResources() {
-        Q_CLEANUP_RESOURCE(qsearchfield_nonmac);
-    }
-#endif
-};
-
-QSearchField::QSearchField(QWidget *parent) : QWidget(parent)
-{
-    static QSearchFieldResources resources;
-
-    QLineEdit *lineEdit = new QLineEdit(this);
-    connect(lineEdit, SIGNAL(textChanged(QString)),
-            this, SIGNAL(textChanged(QString)));
-    connect(lineEdit, SIGNAL(editingFinished()),
-            this, SIGNAL(editingFinished()));
-    connect(lineEdit, SIGNAL(returnPressed()),
-            this, SIGNAL(returnPressed()));
-    connect(lineEdit, SIGNAL(textChanged(QString)),
-            this, SLOT(setText(QString)));
-
-    int iconsize = style()->pixelMetric(QStyle::PM_SmallIconSize);
-    QToolButton *clearButton = new QToolButton(this);
-    QIcon clearIcon = QIcon::fromTheme(QLatin1String("edit-clear"),
-                                       QIcon(QLatin1String(":/Qocoa/qsearchfield_nonmac_clear.png")));
-    clearButton->setIcon(clearIcon);
-    clearButton->setIconSize(QSize(iconsize, iconsize));
-    clearButton->setFixedSize(QSize(iconsize, iconsize));
-    clearButton->setStyleSheet("border: none;");
-    clearButton->hide();
-    connect(clearButton, SIGNAL(clicked()), this, SLOT(clear()));
-
-    QToolButton *searchButton = new QToolButton(this);
-    QIcon searchIcon = QIcon(QLatin1String(":/Qocoa/qsearchfield_nonmac_magnifier.png"));
-    searchButton->setIcon(searchIcon);
-    searchButton->setIconSize(QSize(iconsize, iconsize));
-    searchButton->setFixedSize(QSize(iconsize, iconsize));
-    searchButton->setStyleSheet("border: none;");
-    searchButton->setPopupMode(QToolButton::InstantPopup);
-    searchButton->setEnabled(false);
-    connect(searchButton, SIGNAL(clicked()), this, SLOT(popupMenu()));
-
-    pimpl = new QSearchFieldPrivate(this, lineEdit, clearButton, searchButton);
-
-    lineEdit->setStyleSheet(QString("QLineEdit { padding-left: %1px; padding-right: %2px; } ")
-                            .arg(pimpl->searchButtonPaddedWidth())
-                            .arg(pimpl->clearButtonPaddedWidth()));
-    const int width = qMax(lineEdit->minimumSizeHint().width(), pimpl->clearButtonPaddedWidth() + pimpl->searchButtonPaddedWidth());
-    const int height = qMax(lineEdit->minimumSizeHint().height(),
-                       qMax(pimpl->clearButtonPaddedHeight(),
-                            pimpl->searchButtonPaddedHeight()));
-    lineEdit->setMinimumSize(width, height);
-
-    QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setMargin(0);
-    layout->addWidget(lineEdit);
-}
-
-void QSearchField::setMenu(QMenu *menu)
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    pimpl->searchMenu = menu;
-
-    QIcon searchIcon = menu ? QIcon(QLatin1String(":/Qocoa/qsearchfield_nonmac_magnifier_menu.png"))
-                            : QIcon(QLatin1String(":/Qocoa/qsearchfield_nonmac_magnifier.png"));
-    pimpl->searchButton->setIcon(searchIcon);
-    pimpl->searchButton->setEnabled(isEnabled() && menu);
-}
-
-void QSearchField::popupMenu()
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    if (pimpl->searchMenu) {
-        const QRect screenRect = qApp->desktop()->availableGeometry(pimpl->searchButton);
-        const QSize sizeHint = pimpl->searchMenu->sizeHint();
-        const QRect rect = pimpl->searchButton->rect();
-        const int x = pimpl->searchButton->isRightToLeft()
-                ? rect.right() - sizeHint.width()
-                : rect.left();
-        const int y = pimpl->searchButton->mapToGlobal(QPoint(0, rect.bottom())).y() + sizeHint.height() <= screenRect.height()
-                ? rect.bottom()
-                : rect.top() - sizeHint.height();
-        QPoint point = pimpl->searchButton->mapToGlobal(QPoint(x, y));
-        point.rx() = qMax(screenRect.left(), qMin(point.x(), screenRect.right() - sizeHint.width()));
-        point.ry() += 1;
-
-        pimpl->searchMenu->popup(point);
-    }
-}
-
-void QSearchField::changeEvent(QEvent* event)
-{
-    if (event->type() == QEvent::EnabledChange) {
-        Q_ASSERT(pimpl);
-        if (!pimpl)
-            return;
-
-        const bool enabled = isEnabled();
-        pimpl->searchButton->setEnabled(enabled && pimpl->searchMenu);
-        pimpl->lineEdit->setEnabled(enabled);
-        pimpl->clearButton->setEnabled(enabled);
-    }
-    QWidget::changeEvent(event);
-}
-
-void QSearchField::setText(const QString &text)
-{
-    Q_ASSERT(pimpl && pimpl->clearButton && pimpl->lineEdit);
-    if (!(pimpl && pimpl->clearButton && pimpl->lineEdit))
-        return;
-
-    pimpl->clearButton->setVisible(!text.isEmpty());
-
-    if (text != this->text())
-        pimpl->lineEdit->setText(text);
-}
-
-void QSearchField::setPlaceholderText(const QString &text)
-{
-    Q_ASSERT(pimpl && pimpl->lineEdit);
-    if (!(pimpl && pimpl->lineEdit))
-        return;
-
-#if QT_VERSION >= 0x040700
-    pimpl->lineEdit->setPlaceholderText(text);
-#endif
-}
-
-void QSearchField::clear()
-{
-    Q_ASSERT(pimpl && pimpl->lineEdit);
-    if (!(pimpl && pimpl->lineEdit))
-        return;
-
-    pimpl->lineEdit->clear();
-}
-
-void QSearchField::selectAll()
-{
-    Q_ASSERT(pimpl && pimpl->lineEdit);
-    if (!(pimpl && pimpl->lineEdit))
-        return;
-
-    pimpl->lineEdit->selectAll();
-}
-
-QString QSearchField::text() const
-{
-    Q_ASSERT(pimpl && pimpl->lineEdit);
-    if (!(pimpl && pimpl->lineEdit))
-        return QString();
-
-    return pimpl->lineEdit->text();
-}
-
-QString QSearchField::placeholderText() const {
-    Q_ASSERT(pimpl && pimpl->lineEdit);
-    if (!(pimpl && pimpl->lineEdit))
-        return QString();
-
-#if QT_VERSION >= 0x040700
-    return pimpl->lineEdit->placeholderText();
-#else
-    return QString();
-#endif
-}
-
-void QSearchField::setFocus(Qt::FocusReason reason)
-{
-    Q_ASSERT(pimpl && pimpl->lineEdit);
-    if (pimpl && pimpl->lineEdit)
-        pimpl->lineEdit->setFocus(reason);
-}
-
-void QSearchField::setFocus()
-{
-    setFocus(Qt::OtherFocusReason);
-}
-
-void QSearchField::resizeEvent(QResizeEvent *resizeEvent)
-{
-    Q_ASSERT(pimpl && pimpl->clearButton && pimpl->lineEdit);
-    if (!(pimpl && pimpl->clearButton && pimpl->lineEdit))
-        return;
-
-    QWidget::resizeEvent(resizeEvent);
-    const int x = width() - pimpl->clearButtonPaddedWidth();
-    const int y = (height() - pimpl->clearButton->height())/2;
-    pimpl->clearButton->move(x, y);
-
-    pimpl->searchButton->move(pimpl->lineEditFrameWidth() * 2,
-                              (height() - pimpl->searchButton->height())/2);
-}

src/gui/qocoa/qsearchfield_nonmac.qrc

@@ -1,7 +0,0 @@
-<RCC>
-    <qresource prefix="/Qocoa">
-        <file>qsearchfield_nonmac_clear.png</file>
-        <file>qsearchfield_nonmac_magnifier_menu.png</file>
-        <file>qsearchfield_nonmac_magnifier.png</file>
-    </qresource>
-</RCC>