From b3578c547ee8ebe7b25c69c9263b0b7b5df53f27 Mon Sep 17 00:00:00 2001
From: Yann Dirson <ydirson@altern.org>
Date: Sun, 20 Apr 2008 21:14:25 +0200
Subject: [PATCH] Misc cleanups.

---
 src/icsconnection.cpp            | 1 -
 src/mainwindow.cpp               | 4 ++--
 src/poolinfo.cpp                 | 1 -
 src/positioninfo.cpp             | 1 -
 src/variant.h                    | 3 ---
 src/variants.cpp                 | 2 +-
 src/variants/chess/validator.cpp | 4 ++--
 7 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/icsconnection.cpp b/src/icsconnection.cpp
index bfe412a..388ee58 100644
--- a/src/icsconnection.cpp
+++ b/src/icsconnection.cpp
@@ -25,7 +25,6 @@
 #include "gameinfo.h"
 #include "pgnparser.h"
 #include "icslistener.h"
-#include "variants.h"
 
 using namespace boost;
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 6f4e9e6..374e58f 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -88,8 +88,8 @@ MainWindow::MainWindow(const QString& variant)
 
   Variant* v = Variants::self().create(variant);
   if (v == NULL)
-    kFatal() << "Cannot instantiate variant \"" << variant << "\", aborting";
- 
+    kFatal() << "Cannot instantiate variant " << variant << "- aborting";
+
   ChessTable* board = new ChessTable(v);
 
   board->setFocus();
diff --git a/src/poolinfo.cpp b/src/poolinfo.cpp
index 3d50bb8..01e73c0 100644
--- a/src/poolinfo.cpp
+++ b/src/poolinfo.cpp
@@ -10,7 +10,6 @@
 
 #include "poolinfo.h"
 #include "gameinfo.h"
-#include "variants.h"
 
 QRegExp PoolInfo::s_pattern("^<b1>\\s+game\\s+(\\d+)" //game num
                             "\\s+white\\s+\\[([QKBNRP]*)\\]"  // white pieces
diff --git a/src/positioninfo.cpp b/src/positioninfo.cpp
index f6a3c86..d1c2fcd 100644
--- a/src/positioninfo.cpp
+++ b/src/positioninfo.cpp
@@ -14,7 +14,6 @@
 #include <core/board.h>
 #include <core/state.h>
 
-#include "variants.h"
 #include "gameinfo.h"
 #include "icsapi.h"
 
diff --git a/src/variant.h b/src/variant.h
index 65caa52..3836ff3 100644
--- a/src/variant.h
+++ b/src/variant.h
@@ -11,9 +11,6 @@
 #ifndef CORE__VARIANT_H
 #define CORE__VARIANT_H
 
-#include <KPluginFactory>
-#include <KPluginLoader>
-
 #include <core/repository.h>
 
 /**
diff --git a/src/variants.cpp b/src/variants.cpp
index 12a84ae..d1732a1 100644
--- a/src/variants.cpp
+++ b/src/variants.cpp
@@ -48,7 +48,7 @@ Variant* Variants::create(const KService::Ptr& plugin) {
     return new Variant(plugin->name(), repo,
       plugin->property("X-Tagua-Proxy").toString());
       
-  return 0;
+  return NULL;
 }
 
 Variant* Variants::create(const QString& name) {
diff --git a/src/variants/chess/validator.cpp b/src/variants/chess/validator.cpp
index fdadb0b..f652226 100644
--- a/src/variants/chess/validator.cpp
+++ b/src/variants/chess/validator.cpp
@@ -93,8 +93,8 @@ bool Validator::attacks(const IState* state, const IColor* player,
 
   for (int i = 0; i < state->board()->size().x; i++) {
     for (int j = 0; j < state->board()->size().y; j++) {
-      Point p(i, j);
-      Piece piece = state->board()->get(p);
+      const Point p(i, j);
+      const Piece piece = state->board()->get(p);
       Move move(p, square);
       if (piece != Piece() && 
           piece.color() == player &&
-- 
2.11.4.GIT