summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/drawpad/drawpadcanvas.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp
index 49a8cf0..40c27b5 100644
--- a/noncore/graphics/drawpad/drawpadcanvas.cpp
+++ b/noncore/graphics/drawpad/drawpadcanvas.cpp
@@ -152,65 +152,65 @@ DrawPadCanvas::~DrawPadCanvas()
152 152
153void DrawPadCanvas::load(QIODevice* ioDevice) 153void DrawPadCanvas::load(QIODevice* ioDevice)
154{ 154{
155 QTextStream textStream(ioDevice); 155 QTextStream textStream(ioDevice);
156 textStream.setCodec(QTextCodec::codecForName("UTF-8")); 156 textStream.setCodec(QTextCodec::codecForName("UTF-8"));
157 157
158 QXmlInputSource xmlInputSource(textStream); 158 QXmlInputSource xmlInputSource(textStream);
159 QXmlSimpleReader xmlSimpleReader; 159 QXmlSimpleReader xmlSimpleReader;
160 DrawPadCanvasXmlHandler drawPadCanvasXmlHandler; 160 DrawPadCanvasXmlHandler drawPadCanvasXmlHandler;
161 161
162 xmlSimpleReader.setContentHandler(&drawPadCanvasXmlHandler); 162 xmlSimpleReader.setContentHandler(&drawPadCanvasXmlHandler);
163 xmlSimpleReader.parse(xmlInputSource); 163 xmlSimpleReader.parse(xmlInputSource);
164 164
165 m_pages = drawPadCanvasXmlHandler.pixmaps(); 165 m_pages = drawPadCanvasXmlHandler.pixmaps();
166 166
167 if (m_pages.isEmpty()) { 167 if (m_pages.isEmpty()) {
168 m_pages.append(new QPixmap(contentsRect().size())); 168 m_pages.append(new QPixmap(contentsRect().size()));
169 m_pages.current()->fill(Qt::white); 169 m_pages.current()->fill(Qt::white);
170 } 170 }
171 171
172 m_pageBackups.clear(); 172 m_pageBackups.clear();
173 m_pageBackups.append(new QPixmap(*(m_pages.current()))); 173 m_pageBackups.append(new QPixmap(*(m_pages.current())));
174 174
175 resizeContents(m_pages.current()->width(), m_pages.current()->height()); 175 resizeContents(m_pages.current()->width(), m_pages.current()->height());
176 viewport()->update(); 176 viewport()->update();
177 177
178 emit pagesChanged(); 178 emit pagesChanged();
179 emit pageBackupsChanged(); 179 emit pageBackupsChanged();
180} 180}
181 181
182void DrawPadCanvas::initialPage() 182void DrawPadCanvas::initialPage()
183{ 183{
184 m_pages.append(new QPixmap(234, 252)); 184 m_pages.append(new QPixmap(234, 233));
185 m_pages.current()->fill(Qt::white); 185 m_pages.current()->fill(Qt::white);
186 186
187 m_pageBackups.clear(); 187 m_pageBackups.clear();
188 m_pageBackups.append(new QPixmap(*(m_pages.current()))); 188 m_pageBackups.append(new QPixmap(*(m_pages.current())));
189 189
190 resizeContents(m_pages.current()->width(), m_pages.current()->height()); 190 resizeContents(m_pages.current()->width(), m_pages.current()->height());
191 viewport()->update(); 191 viewport()->update();
192 192
193 emit pagesChanged(); 193 emit pagesChanged();
194 emit pageBackupsChanged(); 194 emit pageBackupsChanged();
195} 195}
196 196
197void DrawPadCanvas::save(QIODevice* ioDevice) 197void DrawPadCanvas::save(QIODevice* ioDevice)
198{ 198{
199 QTextStream textStream(ioDevice); 199 QTextStream textStream(ioDevice);
200 textStream.setCodec(QTextCodec::codecForName("UTF-8")); 200 textStream.setCodec(QTextCodec::codecForName("UTF-8"));
201 201
202 textStream << "<drawpad>" << endl; 202 textStream << "<drawpad>" << endl;
203 textStream << " <images>" << endl; 203 textStream << " <images>" << endl;
204 204
205 QListIterator<QPixmap> bufferIterator(m_pages); 205 QListIterator<QPixmap> bufferIterator(m_pages);
206 206
207 for (bufferIterator.toFirst(); bufferIterator.current() != 0; ++bufferIterator) { 207 for (bufferIterator.toFirst(); bufferIterator.current() != 0; ++bufferIterator) {
208 textStream << " <image>" << endl; 208 textStream << " <image>" << endl;
209 209
210 QImage image = bufferIterator.current()->convertToImage(); 210 QImage image = bufferIterator.current()->convertToImage();
211 QByteArray byteArray; 211 QByteArray byteArray;
212 QBuffer buffer(byteArray); 212 QBuffer buffer(byteArray);
213 QImageIO imageIO(&buffer, "XPM"); 213 QImageIO imageIO(&buffer, "XPM");
214 214
215 buffer.open(IO_WriteOnly); 215 buffer.open(IO_WriteOnly);
216 imageIO.setImage(image); 216 imageIO.setImage(image);