Skip to content

Instantly share code, notes, and snippets.

@mame
Created May 3, 2012 08:13
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save mame/2584253 to your computer and use it in GitHub Desktop.
Save mame/2584253 to your computer and use it in GitHub Desktop.
diff --git a/ruviedit/OutlineBar.cpp b/ruviedit/OutlineBar.cpp
index db40aee..d8d263e 100644
--- a/ruviedit/OutlineBar.cpp
+++ b/ruviedit/OutlineBar.cpp
@@ -236,7 +236,8 @@ QTreeWidgetItem *OutlineBar::itemByDir(const QString &fullPath)
void OutlineBar::doParse(EditView *view, QTreeWidgetItem *item)
{
QList<OutlineItem> oi;
- OutlineTokenizer tn(view->document()->begin());
+ QTextBlock tb = view->document()->begin();
+ OutlineTokenizer tn(tb);
int mainLineNum = 0;
parseRuby(tn, oi, 0, mainLineNum);
if( oi.isEmpty() ) return;
diff --git a/ruviedit/OutlineTokenizer.h b/ruviedit/OutlineTokenizer.h
index 9067e09..9aef80e 100644
--- a/ruviedit/OutlineTokenizer.h
+++ b/ruviedit/OutlineTokenizer.h
@@ -1,6 +1,6 @@
#pragma once
-#include <qstring>
+#include <QString>
#include <QTextBlock>
typedef unsigned char uchar;
diff --git a/ruviedit/RubySyntaxHighliter.cpp b/ruviedit/RubySyntaxHighliter.cpp
index aa33a06..0125134 100644
--- a/ruviedit/RubySyntaxHighliter.cpp
+++ b/ruviedit/RubySyntaxHighliter.cpp
@@ -26,7 +26,7 @@
#include "EditView.h"
#include "Settings.h"
#include "ViewTokenizer.h"
-#include <qdebug>
+#include <QDebug>
typedef const char cchar;
int getToken(const QString &text, int &ix, QString &token, bool &inBrace, char quote = '\0');
diff --git a/ruviedit/SettingsDlg.h b/ruviedit/SettingsDlg.h
index 3d31658..9aa7b3e 100644
--- a/ruviedit/SettingsDlg.h
+++ b/ruviedit/SettingsDlg.h
@@ -2,7 +2,7 @@
#define SETTINGSDLG_H
#include <QDialog>
-#include <qhash>
+#include <QHash>
class QFontComboBox;
class QSpinBox;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment