comparison demos/browser/bookmarks.d @ 80:85c59c4e5f19

remove QLatin1String and other fixes
author mandel
date Sun, 24 May 2009 15:25:41 +0000
parents 0654fc9bac95
children 87bb4e622f9e
comparison
equal deleted inserted replaced
79:957f549cfc65 80:85c59c4e5f19
201 return; 201 return;
202 202
203 XbelReader reader; 203 XbelReader reader;
204 BookmarkNode importRootNode = reader.read(fileName); 204 BookmarkNode importRootNode = reader.read(fileName);
205 if (reader.error() != QXmlStreamReader.NoError) { 205 if (reader.error() != QXmlStreamReader.NoError) {
206 QMessageBox.warning(0, QLatin1String("Loading Bookmark"), 206 QMessageBox.warning(0, "Loading Bookmark",
207 tr("Error when loading bookmarks on line %1, column %2:\n" 207 tr("Error when loading bookmarks on line %1, column %2:\n"
208 "%3").arg(reader.lineNumber()).arg(reader.columnNumber()).arg(reader.errorString())); 208 "%3").arg(reader.lineNumber()).arg(reader.columnNumber()).arg(reader.errorString()));
209 } 209 }
210 210
211 importRootNode.setType(BookmarkNode.Folder); 211 importRootNode.setType(BookmarkNode.Folder);
234 if (!m_loaded) 234 if (!m_loaded)
235 return; 235 return;
236 236
237 XbelWriter writer; 237 XbelWriter writer;
238 string dir = QDesktopServices.storageLocation(QDesktopServices.DataLocation); 238 string dir = QDesktopServices.storageLocation(QDesktopServices.DataLocation);
239 string bookmarkFile = dir + QLatin1String("/bookmarks.xbel"); 239 string bookmarkFile = dir ~ "/bookmarks.xbel";
240 if (!writer.write(bookmarkFile, m_bookmarkRootNode)) 240 if (!writer.write(bookmarkFile, m_bookmarkRootNode))
241 qWarning() << "BookmarkManager: error saving to" << bookmarkFile; 241 qWarning() << "BookmarkManager: error saving to" << bookmarkFile;
242 } 242 }
243 243
244 private: 244 private:
248 if (m_loaded) 248 if (m_loaded)
249 return; 249 return;
250 m_loaded = true; 250 m_loaded = true;
251 251
252 string dir = QDesktopServices.storageLocation(QDesktopServices.DataLocation); 252 string dir = QDesktopServices.storageLocation(QDesktopServices.DataLocation);
253 string bookmarkFile = dir ~ QLatin1String("/bookmarks.xbel"); 253 string bookmarkFile = dir ~ "/bookmarks.xbel";
254 if (!QFile.exists(bookmarkFile)) 254 if (!QFile.exists(bookmarkFile))
255 bookmarkFile = QLatin1String(":defaultbookmarks.xbel"); 255 bookmarkFile = ":defaultbookmarks.xbel";
256 256
257 XbelReader reader; 257 XbelReader reader;
258 m_bookmarkRootNode = reader.read(bookmarkFile); 258 m_bookmarkRootNode = reader.read(bookmarkFile);
259 if (reader.error() != QXmlStreamReader.NoError) { 259 if (reader.error() != QXmlStreamReader.NoError) {
260 QMessageBox.warning(0, QLatin1String("Loading Bookmark"), 260 QMessageBox.warning(0, "Loading Bookmark",
261 tr("Error when loading bookmarks on line %1, column %2:\n" 261 tr("Error when loading bookmarks on line %1, column %2:\n"
262 "%3").arg(reader.lineNumber()).arg(reader.columnNumber()).arg(reader.errorString())); 262 "%3").arg(reader.lineNumber()).arg(reader.columnNumber()).arg(reader.errorString()));
263 } 263 }
264 264
265 BookmarkNode toolbar = null; 265 BookmarkNode toolbar = null;
674 } 674 }
675 mimeData.setData(MIMETYPE, data); 675 mimeData.setData(MIMETYPE, data);
676 return mimeData; 676 return mimeData;
677 } 677 }
678 678
679 const string MIMETYPE = QLatin1String("application/bookmarks.xbel"); 679 const string MIMETYPE = "application/bookmarks.xbel";
680 680
681 string[] mimeTypes() 681 string[] mimeTypes()
682 { 682 {
683 return [ MIMETYPE ]; 683 return [ MIMETYPE ];
684 } 684 }
695 QDataStream stream = new QDataStream(&ba, QIODevice.ReadOnly); 695 QDataStream stream = new QDataStream(&ba, QIODevice.ReadOnly);
696 if (stream.atEnd()) 696 if (stream.atEnd())
697 return false; 697 return false;
698 698
699 QUndoStack undoStack = m_bookmarksManager.undoRedoStack(); 699 QUndoStack undoStack = m_bookmarksManager.undoRedoStack();
700 undoStack.beginMacro(QLatin1String("Move Bookmarks")); 700 undoStack.beginMacro("Move Bookmarks");
701 701
702 while (!stream.atEnd()) { 702 while (!stream.atEnd()) {
703 QByteArray encodedData; 703 QByteArray encodedData;
704 stream >> encodedData; 704 stream >> encodedData;
705 QBuffer buffer = new QBuffer(&encodedData); 705 QBuffer buffer = new QBuffer(&encodedData);
706 buffer.open(QBuffer.ReadOnly); 706 buffer.open(QBuffer.ReadOnly);
707 707
708 XbelReader reader; 708 auto reader = new XbelReader;
709 BookmarkNode rootNode = reader.read(&buffer); 709 BookmarkNode rootNode = reader.read(&buffer);
710 BookmarkNode[] children = rootNode.children(); 710 BookmarkNode[] children = rootNode.children();
711 for (int i = 0; i < children.count(); ++i) { 711 for (int i = 0; i < children.count(); ++i) {
712 BookmarkNode bookmarkNode = children[i]; 712 BookmarkNode bookmarkNode = children[i];
713 rootNode.remove(bookmarkNode); 713 rootNode.remove(bookmarkNode);