diff --git a/kdev-pg/kdev-pg-code-gen.cpp b/kdev-pg/kdev-pg-code-gen.cpp
--- a/kdev-pg/kdev-pg-code-gen.cpp
+++ b/kdev-pg/kdev-pg-code-gen.cpp
@@ -101,7 +101,7 @@
         sprintf(__var, "__node_%d", __id);
         ++__id;
 
-        out << capSymbolName << "Ast *" << __var << " = 0;" << endl
+        out << capSymbolName << "Ast *" << __var << " = nullptr;" << endl
             << "if (!parse" << capSymbolName << "(&" << __var;
 
         if (!node->mArguments.isEmpty())
@@ -586,7 +586,7 @@
       out << " && " << i->op.mCond;
     out << ") { const unsigned int priority = " << i->priority << ";";
     out << i->op.mCode;
-    out << "AstNode *last = 0; bool br = false;";
+    out << "AstNode *last = nullptr; bool br = false;";
     out << "while(priority < opStack.last().p + " << i->left << ") {";
     out << "if(opStack.size() == 1) {"
            "if(last)\n"
@@ -620,7 +620,7 @@
       out << " && " << i->op.mCond;
     out << ") { const unsigned int priority = " << i->priority << ";";
     out << i->op.mCode;
-    out << "AstNode *last = 0; bool br = false;";
+    out << "AstNode *last = nullptr; bool br = false;";
     out << "while(priority < opStack.last().p + " << i->left << ") {";
     out << "if(opStack.size() == 1) {"
            "if(last)\n"
@@ -660,7 +660,7 @@
       out << " && " << i->first.mCond;
         out << ") { const unsigned int priority = " << i->priority << ";";
     out << i->first.mCode;
-    out << "AstNode *last = 0; bool br = false;";
+    out << "AstNode *last = nullptr; bool br = false;";
     out << "while(priority < opStack.last().p + " << i->left << ") {";
     out << "if(opStack.size() == 1) {"
            "if(last)\n"
@@ -719,9 +719,9 @@
            "else"
            "{\n"
            "void *last = opStack.last().n;"
-           "if(reinterpret_cast<Prefix" << nodeType << "*>(last)->first == 0)\n"
+           "if(reinterpret_cast<Prefix" << nodeType << "*>(last)->first == nullptr)\n"
            "reinterpret_cast<Prefix" << nodeType << "*>(last)->first = node;"
-           "else if(reinterpret_cast<Binary" << nodeType << "*>(last)->second == 0)\n"
+           "else if(reinterpret_cast<Binary" << nodeType << "*>(last)->second == nullptr)\n"
            "reinterpret_cast<Binary" << nodeType << "*>(last)->second = node;"
            "else\n"
            "reinterpret_cast<Ternary" << nodeType << "*>(last)->third = node;"
@@ -760,9 +760,9 @@
 if(!opStack.isEmpty())\
 {\
   void *last = opStack.last().n;\
-  if(reinterpret_cast<Prefix" << nodeType << "*>(last)->first == 0)\n\
+  if(reinterpret_cast<Prefix" << nodeType << "*>(last)->first == nullptr)\n\
     reinterpret_cast<Prefix" << nodeType << "*>(last)->first = " << __var << ";" << endl; \
-  out << "else if(reinterpret_cast<Binary" << nodeType << "*>(last)->second == 0)\n\
+  out << "else if(reinterpret_cast<Binary" << nodeType << "*>(last)->second == nullptr)\n\
   reinterpret_cast<Binary" << nodeType << "*>(last)->second = " << __var << ";\
   else\nreinterpret_cast<Ternary" << nodeType << "*>(last)->third = " << __var << ";}\
 else\n\
@@ -866,7 +866,7 @@
     {
       if(isOperatorSymbol(sym))
       {
-        out << "AstNode *olast, *last = 0;"
+        out << "AstNode *olast, *last = nullptr;"
                "while(!opStack.empty())\n"
                "{"
                "olast = last;"
@@ -1167,10 +1167,10 @@
   out << "Parser() {" << endl;
   if (globalSystem.generateAst)
     {
-      out << "memoryPool = 0;" << endl;
+      out << "memoryPool = nullptr;" << endl;
     }
 
-  out << "tokenStream = 0;" << endl
+  out << "tokenStream = nullptr;" << endl
       << "yytoken = Token_EOF;" << endl
       << "mBlockErrors = false;" << endl;
 
diff --git a/kdev-pg/kdev-pg-debug-visitor-gen.cpp b/kdev-pg/kdev-pg-debug-visitor-gen.cpp
--- a/kdev-pg/kdev-pg-debug-visitor-gen.cpp
+++ b/kdev-pg/kdev-pg-debug-visitor-gen.cpp
@@ -103,9 +103,9 @@
   hms(sym);
 
   #define O1(name) \
-      out << "virtual void visit" << name \
+      out << "void visit" << name \
           << "(" << name << "Ast *" << "node" \
-          << ") {" << endl;
+          << ") override {" << endl;
   #define O2(name) \
   out << "printToken(node, QStringLiteral(\"" << name << "\"));" << endl;
   #define O3(name) \
diff --git a/kdev-pg/kdev-pg-default-visitor-gen.cpp b/kdev-pg/kdev-pg-default-visitor-gen.cpp
--- a/kdev-pg/kdev-pg-default-visitor-gen.cpp
+++ b/kdev-pg/kdev-pg-default-visitor-gen.cpp
@@ -47,7 +47,7 @@
   Model::SymbolItem *sym = __it.second;
   
   #define O(name) \
-  out << "virtual void visit" << name << "(" << name << "Ast *node);" << endl;
+  out << "void visit" << name << "(" << name << "Ast *node) override;" << endl;
   
   if(isOperatorSymbol(sym))
   {
diff --git a/kdev-pg/kdev-pg-serialize-visitor-gen.cpp b/kdev-pg/kdev-pg-serialize-visitor-gen.cpp
--- a/kdev-pg/kdev-pg-serialize-visitor-gen.cpp
+++ b/kdev-pg/kdev-pg-serialize-visitor-gen.cpp
@@ -159,9 +159,9 @@
   HasMemberNodes hms(has_members);
   hms(sym);
 
-  out << "virtual void visit" << sym->mCapitalizedName
+  out << "void visit" << sym->mCapitalizedName
       << "(" << sym->mCapitalizedName << "Ast *" << "node"
-      << ") {" << endl;
+      << ") override {" << endl;
 
   Model::EvolveItem *e = globalSystem.searchRule(sym);
   visitNode(e);