Krazy fixes: cleanup all headers

[kdenlive] / src / titlewidget.cpp

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index 08eb7f2579a56c091bd27525b18236c79f998392..ed1b6801d9e5a8dc1e0c43a2c5d9d777eb5997dd 100644 (file)
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -15,28 +15,24 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "titlewidget.h"
+#include "kdenlivesettings.h"
 
+#include <KDebug>
+#include <KGlobalSettings>
+#include <KFileDialog>
+#include <KStandardDirs>
 
-#include <QGraphicsView>
 #include <QDomDocument>
 #include <QGraphicsItem>
 #include <QGraphicsSvgItem>
 #include <QTimer>
-
 #include <QToolBar>
 #include <QMenu>
 
-#include <KDebug>
-#include <KGlobalSettings>
-#include <KFileDialog>
-#include <KStandardDirs>
-
-#include "titlewidget.h"
-#include "kdenlivesettings.h"
-
 int settingUp = false;
 
-TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget *parent): QDialog(parent), m_render(render), m_count(0), m_projectPath(projectPath) {
+TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget *parent): QDialog(parent), m_render(render), m_count(0), m_projectPath(projectPath), startViewport(NULL), endViewport(NULL) {
     setupUi(this);
     setFont(KGlobalSettings::toolBarFont());
     //toolBox->setFont(KGlobalSettings::toolBarFont());
@@ -195,6 +191,21 @@ TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget
     }
 }
 
+TitleWidget::~TitleWidget() {
+    delete m_buttonRect;
+    delete m_buttonText;
+    delete m_buttonImage;
+    delete m_buttonCursor;
+    delete m_buttonSave;
+    delete m_buttonLoad;
+
+    delete m_frameBorder;
+    delete m_frameImage;
+    if (startViewport) delete startViewport;
+    if (endViewport) delete endViewport;
+    delete m_scene;
+}
+
 //static
 QStringList TitleWidget::getFreeTitleInfo(const KUrl &projectUrl) {
     QStringList result;
@@ -321,7 +332,7 @@ void TitleWidget::initViewports() {
 
 void TitleWidget::slotUpdateZoom(int pos) {
     m_scene->setZoom((double) pos / 100);
-    zoom_label->setText(QString::number(pos) + "%");
+    zoom_label->setText(QString::number(pos) + '%');
 }
 
 void TitleWidget::slotZoom(bool up) {
@@ -677,11 +688,11 @@ void TitleWidget::setXml(QDomDocument doc) {
     slotSelectTool();
 }
 
-QPixmap TitleWidget::renderedPixmap() {
-    QPixmap pix(m_frameWidth, m_frameHeight);
+QImage TitleWidget::renderedPixmap() {
+    QImage pix(m_frameWidth, m_frameHeight, QImage::Format_ARGB32);
     pix.fill(Qt::transparent);
     QPainter painter(&pix);
-    painter.setRenderHint(QPainter::Antialiasing);
+    painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::HighQualityAntialiasing);
     m_scene->clearTextSelection();
     QPen framepen = m_frameBorder->pen();
     m_frameBorder->setPen(Qt::NoPen);
@@ -690,6 +701,7 @@ QPixmap TitleWidget::renderedPixmap() {
     m_frameImage->setVisible(false);
 
     m_scene->render(&painter, QRectF(), QRectF(0, 0, m_frameWidth, m_frameHeight));
+    painter.end();
     m_frameBorder->setPen(framepen);
     startViewport->setVisible(true);
     endViewport->setVisible(true);
@@ -752,4 +764,4 @@ void TitleWidget::readChoices() {
     kcolorbutton->setColor(titleConfig.readEntry("background_color", kcolorbutton->color()));
     horizontalSlider->setValue(titleConfig.readEntry("background_alpha", horizontalSlider->value()));
 }
-#include "moc_titlewidget.cpp"
+