Commit aaa0220f authored by Adrian Page's avatar Adrian Page

Build with new kdelibs snapshot.


svn path=/trunk/koffice/; revision=538797
parent e90afbb5
......@@ -23,12 +23,12 @@
#include <q3frame.h>
#include <QPoint>
#include <QImage>
#include <QPixmap>
#include <QWidget>
//Added by qt3to4:
#include <QMouseEvent>
#include <QResizeEvent>
#include <QPaintEvent>
#include <kpixmap.h>
#include <koffice_export.h>
class SliderWidget;
......@@ -57,7 +57,7 @@ signals:
protected:
QColor mC1;
QColor mC2;
KPixmap mPixmap;
QPixmap mPixmap;
QImage mImage;
bool mColorChanged;
bool mPixChanged;
......
......@@ -26,6 +26,7 @@
#include <kmenu.h>
#include <kaction.h>
#include <kactionclasses.h>
#include <kactioncollection.h>
#include <kdebug.h>
#include <klocale.h>
#include <kglobal.h>
......@@ -58,7 +59,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, KActionCollection *ac, const c
m_currentMapping = new QMap<QString, QString>();
m_fixedWidth = 0;
m_setFixedWidth = false;
m_widgetNames = new QStringList();
m_mapper = new QSignalMapper(this);
......@@ -330,7 +331,7 @@ KoPalette * KoPaletteManager::createPalette(const QString & name, const QString
Q_ASSERT(m_view);
KoPalette * palette = 0;
palette = m_palettes->find(name);
if (palette) return palette;
......@@ -354,7 +355,7 @@ KoPalette * KoPaletteManager::createPalette(const QString & name, const QString
if (m_setFixedWidth)
palette->setFixedWidth(m_fixedWidth);
palette->setCaption(caption);
m_palettes->insert(name, palette);
placePalette(name);
......
......@@ -23,6 +23,7 @@
#include <qdom.h>
#include <Q3ValueList>
#include <kaction.h>
#include <kactionmenu.h>
#include "scriptcontainer.h"
......@@ -175,7 +176,7 @@ namespace Kross { namespace Api {
* This signal got emitted when this action is emitted before execution.
*/
void activated(const Kross::Api::ScriptAction*);
/**
* This signal got emitted after this \a ScriptAction got
* executed successfully.
......
......@@ -38,6 +38,7 @@
#include <kpushbutton.h>
#include <kstandarddirs.h>
#include <ktoolbar.h>
#include <kactioncollection.h>
#include <knewstuff/provider.h>
#include <knewstuff/engine.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment