QT_BEGIN_NAMESPACE
template <typename T>
-struct QScopedPointerDeleter
+class QScopedPointerDeleter
{
+public:
static inline void cleanup(T *pointer)
{
// Enforce a complete type.
};
template <typename T>
-struct QScopedPointerArrayDeleter
+class QScopedPointerArrayDeleter
{
+public:
static inline void cleanup(T *pointer)
{
// Enforce a complete type.
// ------------ DesignerPropertyManager:
-DesignerPropertyManager::DesignerPropertyManager(QDesignerFormEditorInterface *core, QObject *parent) :
+DesignerPropertyManager::DesignerPropertyManager(QObject *parent) :
QtVariantPropertyManager(parent),
m_changingSubValue(false),
- m_core(core),
m_sourceOfChange(0)
{
connect(this, SIGNAL(valueChanged(QtProperty*,QVariant)), this, SLOT(slotValueChanged(QtProperty*,QVariant)));
}
break;
case QVariant::Palette: {
- PaletteEditorButton *ed = new PaletteEditorButton(m_core, qvariant_cast<QPalette>(manager->value(property)), parent);
+ PaletteEditorButton *ed = new PaletteEditorButton(qvariant_cast<QPalette>(manager->value(property)), parent);
ed->setSuperPalette(qvariant_cast<QPalette>(manager->attributeValue(property, QLatin1String(superPaletteAttributeC))));
m_palettePropertyToEditors[property].append(ed);
m_editorToPaletteProperty[ed] = property;
{
Q_OBJECT
public:
- explicit DesignerPropertyManager(QDesignerFormEditorInterface *core, QObject *parent = 0);
+ explicit DesignerPropertyManager(QObject *parent = 0);
~DesignerPropertyManager();
virtual QStringList attributes(int propertyType) const;
QMap<QtProperty *, QIcon> m_defaultIcons;
bool m_changingSubValue;
- QDesignerFormEditorInterface *m_core;
QObject *m_object;
enum { BrushRole = 33 };
-PaletteEditor::PaletteEditor(QDesignerFormEditorInterface *core, QWidget *parent) :
+PaletteEditor::PaletteEditor(QWidget *parent) :
QDialog(parent),
m_currentColorGroup(QPalette::Active),
m_paletteModel(new PaletteModel(this)),
m_modelUpdated(false),
m_paletteUpdated(false),
- m_compute(true),
- m_core(core)
+ m_compute(true)
{
ui.setupUi(this);
ui.paletteView->setModel(m_paletteModel);
updatePreviewPalette();
updateStyledButton();
ui.paletteView->setModel(m_paletteModel);
- ColorDelegate *delegate = new ColorDelegate(core, this);
+ ColorDelegate *delegate = new ColorDelegate(this);
ui.paletteView->setItemDelegate(delegate);
ui.paletteView->setEditTriggers(QAbstractItemView::AllEditTriggers);
connect(m_paletteModel, SIGNAL(paletteChanged(QPalette)),
ui.buildButton->setColor(palette().color(QPalette::Active, QPalette::Button));
}
-QPalette PaletteEditor::getPalette(QDesignerFormEditorInterface *core, QWidget* parent, const QPalette &init,
+QPalette PaletteEditor::getPalette(QWidget* parent, const QPalette &init,
const QPalette &parentPal, int *ok)
{
- PaletteEditor dlg(core, parent);
+ PaletteEditor dlg(parent);
QPalette parentPalette(parentPal);
uint mask = init.resolve();
for (int i = 0; i < (int)QPalette::NColorRoles; i++) {
//////////////////////////
-BrushEditor::BrushEditor(QDesignerFormEditorInterface *core, QWidget *parent) :
+BrushEditor::BrushEditor(QWidget *parent) :
QWidget(parent),
m_button(new QtColorButton(this)),
- m_changed(false),
- m_core(core)
+ m_changed(false)
{
QLayout *layout = new QHBoxLayout(this);
layout->setMargin(0);
}
//////////////////////////
-ColorDelegate::ColorDelegate(QDesignerFormEditorInterface *core, QObject *parent) :
- QItemDelegate(parent),
- m_core(core)
+ColorDelegate::ColorDelegate(QObject *parent) :
+ QItemDelegate(parent)
{
}
//editor->installEventFilter(const_cast<ColorDelegate *>(this));
ed = editor;
} else {
- BrushEditor *editor = new BrushEditor(m_core, parent);
+ BrushEditor *editor = new BrushEditor(parent);
connect(editor, SIGNAL(changed(QWidget*)), this, SIGNAL(commitData(QWidget*)));
editor->setFocusPolicy(Qt::NoFocus);
editor->installEventFilter(const_cast<ColorDelegate *>(this));
public:
virtual ~PaletteEditor();
- static QPalette getPalette(QDesignerFormEditorInterface *core,
- QWidget* parent, const QPalette &init = QPalette(),
+ static QPalette getPalette( QWidget* parent,
+ const QPalette &init = QPalette(),
const QPalette &parentPal = QPalette(), int *result = 0);
QPalette palette() const;
protected:
private:
- PaletteEditor(QDesignerFormEditorInterface *core, QWidget *parent);
+ PaletteEditor(QWidget *parent);
void buildPalette();
void updatePreviewPalette();
bool m_modelUpdated;
bool m_paletteUpdated;
bool m_compute;
- QDesignerFormEditorInterface *m_core;
};
{
Q_OBJECT
public:
- explicit BrushEditor(QDesignerFormEditorInterface *core, QWidget *parent = 0);
+ explicit BrushEditor(QWidget *parent = 0);
void setBrush(const QBrush &brush);
QBrush brush() const;
private:
QtColorButton *m_button;
bool m_changed;
- QDesignerFormEditorInterface *m_core;
};
class RoleEditor : public QWidget
Q_OBJECT
public:
- explicit ColorDelegate(QDesignerFormEditorInterface *core, QObject *parent = 0);
+ explicit ColorDelegate(QObject *parent = 0);
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
const QModelIndex &index) const;
virtual void paint(QPainter *painter, const QStyleOptionViewItem &opt,
const QModelIndex &index) const;
virtual QSize sizeHint(const QStyleOptionViewItem &opt, const QModelIndex &index) const;
-private:
- QDesignerFormEditorInterface *m_core;
};
} // namespace qdesigner_internal
using namespace qdesigner_internal;
-PaletteEditorButton::PaletteEditorButton(QDesignerFormEditorInterface *core, const QPalette &palette, QWidget *parent)
+PaletteEditorButton::PaletteEditorButton(const QPalette &palette, QWidget *parent)
: QToolButton(parent),
m_palette(palette)
{
- m_core = core;
setFocusPolicy(Qt::NoFocus);
setText(tr("Change Palette"));
setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
{
int result;
QPalette p = QPalette();
- QPalette pal = PaletteEditor::getPalette(m_core, 0, m_palette, m_superPalette, &result);
+ QPalette pal = PaletteEditor::getPalette(0, m_palette, m_superPalette, &result);
if (result == QDialog::Accepted) {
m_palette = pal;
emit paletteChanged(m_palette);
{
Q_OBJECT
public:
- PaletteEditorButton(QDesignerFormEditorInterface *core, const QPalette &palette, QWidget *parent = 0);
+ PaletteEditorButton(const QPalette &palette, QWidget *parent = 0);
virtual ~PaletteEditorButton();
void setSuperPalette(const QPalette &palette);
private:
QPalette m_palette;
QPalette m_superPalette;
- QDesignerFormEditorInterface *m_core;
};
} // namespace qdesigner_internal
m_propertySheet(0),
m_currentBrowser(0),
m_treeBrowser(0),
- m_propertyManager(new DesignerPropertyManager(m_core, this)),
+ m_propertyManager(new DesignerPropertyManager(this)),
m_dynamicGroup(0),
m_updatingBrowser(false),
m_stackedWidget(new QStackedWidget),
m_updatingBrowser(false)
{
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
- m_propertyManager = new DesignerPropertyManager(form->core(), this);
+ m_propertyManager = new DesignerPropertyManager(this);
m_editorFactory = new DesignerEditorFactory(form->core(), this);
m_editorFactory->setSpacing(0);
m_propertyBrowser = new ItemPropertyBrowser;
ActionEditor::ActionEditor(QDesignerFormEditorInterface *core, QWidget *parent, Qt::WindowFlags flags) :
QDesignerActionEditorInterface(parent, flags),
m_core(core),
+#if 0 // ### implement me
m_actionGroups(0),
+#endif
m_actionView(new ActionView),
m_actionNew(new QAction(tr("New..."), this)),
m_actionEdit(new QAction(tr("Edit..."), this)),
QDesignerFormEditorInterface *m_core;
QPointer<QDesignerFormWindowInterface> m_formWindow;
+#if 0 // ### implement me
QListWidget *m_actionGroups;
+#endif
ActionView *m_actionView;
return str;
}
-static inline QDebug operator<<(QDebug str, const Grid &g) { return g.debug(str); }
-
void Grid::setCells(const QRect &c, QWidget* w)
{
const int bottom = c.top() + c.height();
qdesigner_internal::getFormLayoutItemPosition(formLayout, index, row, column, rowspan, colspan);
}
-QRect gridItemInfo(const QFormLayout *form, int index)
-{
- int row;
- int column;
- int colspan;
- qdesigner_internal::getFormLayoutItemPosition(form, index, &row, &column, 0, &colspan);
- return QRect(column, row, colspan, 1);
-}
} // namespace anonymous
QT_BEGIN_NAMESPACE
}
static inline QDebug operator<<(QDebug str, const QGridLayout &gl) { return debugGridLikeLayout(str, gl); }
-static inline QDebug operator<<(QDebug str, const QFormLayout &fl) { return debugGridLikeLayout(str, fl); }
static inline bool isEmptyFormLayoutRow(const QFormLayout *fl, int row)
{
QT_BEGIN_NAMESPACE
-static const qreal aliasedCoordinateDelta = 0.5 - 0.015625;
-
#define qreal_to_fixed_26_6(f) (int(f * 64))
-
-
-
static const QRectF boundingRect(const QPointF *points, int pointCount)
{
const QPointF *e = points;
QString rightHalf = title.mid(leftHalf.size() + 1);
while (!leftHalf.isEmpty() && !rightHalf.isEmpty()) {
leftHalf.chop(1);
- int width = fontMetrics.width(leftHalf + ellipsis + rightHalf);
- if (width < rect.width()) {
+ int fontwidth = fontMetrics.width(leftHalf + ellipsis + rightHalf);
+ if (fontwidth < rect.width()) {
title = leftHalf + ellipsis + rightHalf;
- width = width;
+ width = fontwidth;
break;
}
rightHalf.remove(0, 1);
- width = fontMetrics.width(leftHalf + ellipsis + rightHalf);
- if (width < rect.width()) {
+ fontwidth = fontMetrics.width(leftHalf + ellipsis + rightHalf);
+ if (fontwidth < rect.width()) {
title = leftHalf + ellipsis + rightHalf;
- width = width;
+ width = fontwidth;
break;
}
}
static QString resolveFontFamilyAlias(const QString &family);
static void load(const QFontPrivate *d, int script);
#ifdef Q_WS_X11
- static QFontEngine *loadXlfd(int screen, int script, const QFontDef &request, int force_encoding_id = -1);
+ static QFontEngine *loadXlfd(int script, const QFontDef &request, int force_encoding_id = -1);
#endif
friend struct QFontDef;
return fe;
}
-QFontEngine *QFontDatabase::loadXlfd(int screen, int script, const QFontDef &request, int force_encoding_id)
+QFontEngine *QFontDatabase::loadXlfd(int script, const QFontDef &request, int force_encoding_id)
{
QMutexLocker locker(fontDatabaseMutex());
}
#endif
- fe = new QFontEngineMultiXLFD(request, encodings, screen);
+ fe = new QFontEngineMultiXLFD(request, encodings);
}
return fe;
}
fe = loadFc(d, script, req);
#endif
} else if (mainThread && qt_is_gui_used) {
- fe = loadXlfd(d->screen, script, req);
+ fe = loadXlfd(script, req);
}
if (!fe) {
fe = new QFontEngineBox(req.pixelSize);
* This struct represents one font file on disk (like Arial.ttf) and is shared between all the font engines
* that show this font file (at different pixel sizes).
*/
-struct QFreetypeFace
+class QFreetypeFace
{
+public:
void computeSize(const QFontDef &fontDef, int *xsize, int *ysize, bool *outline_drawing);
QFontEngine::Properties properties() const;
bool getSfntTable(uint tag, uchar *buffer, uint *length) const;
// Multi XLFD engine
// ------------------------------------------------------------------
-QFontEngineMultiXLFD::QFontEngineMultiXLFD(const QFontDef &r, const QList<int> &l, int s)
- : QFontEngineMulti(l.size()), encodings(l), screen(s), request(r)
+QFontEngineMultiXLFD::QFontEngineMultiXLFD(const QFontDef &r, const QList<int> &l)
+ : QFontEngineMulti(l.size()), encodings(l), request(r)
{
loadEngine(0);
fontDef = engines[0]->fontDef;
Q_ASSERT(at < engines.size());
Q_ASSERT(engines.at(at) == 0);
const int encoding = encodings.at(at);
- QFontEngine *fontEngine = QFontDatabase::loadXlfd(0, QUnicodeTables::Common, request, encoding);
+ QFontEngine *fontEngine = QFontDatabase::loadXlfd(QUnicodeTables::Common, request, encoding);
Q_ASSERT(fontEngine != 0);
fontEngine->ref.ref();
engines[at] = fontEngine;
class QFontEngineMultiXLFD : public QFontEngineMulti
{
public:
- QFontEngineMultiXLFD(const QFontDef &r, const QList<int> &l, int s);
+ QFontEngineMultiXLFD(const QFontDef &r, const QList<int> &l);
~QFontEngineMultiXLFD();
void loadEngine(int at);
private:
QList<int> encodings;
- int screen;
QFontDef request;
};
class QtVariantPropertyPrivate
{
- QtVariantProperty *q_ptr;
public:
QtVariantPropertyPrivate(QtVariantPropertyManager *m) : manager(m) {}