From 82a2e5cd22b617a1b651112adc8e4298c72046ce Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Tue, 31 Oct 2006 13:44:41 +0000
Subject: [PATCH]   * Properly rename cxxtest.cpp to cpptest.cpp to preserve
 history.

---
 cxx/cpptest.cpp | 103 ------------------------------------------------
 cxx/cxxtest.cpp |   8 ++--
 2 files changed, 4 insertions(+), 107 deletions(-)
 delete mode 100644 cxx/cpptest.cpp

diff --git a/cxx/cpptest.cpp b/cxx/cpptest.cpp
deleted file mode 100644
index 8eb0416..0000000
--- a/cxx/cpptest.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *  cpptest       libcaca++ rendering test
- *  Copyright (c) 2006 Jean-Yves Lamoureux <jylam@lnxscene.org>
- *                All Rights Reserved
- *
- *  $Id$
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the Do What The Fuck You Want To
- *  Public License, Version 2, as published by Sam Hocevar. See
- *  http://sam.zoy.org/wtfpl/COPYING for more details.
- */
-
-#include "config.h"
-
-#include <iostream>
-
-#include <cucul++.h>
-#include <caca++.h>
-
-using namespace std;
-
-
-static char const *pig[]= {
-    "                                   ",
-    "                             _     ",
-    "    _._ _..._ .-',     _.._(`))    ",
-    "   '-. `     '  /-._.-'    ',/     ",
-    "      )         \\            '.    ",
-    "     / _    _    |             \\   ",
-    "    |  a    a    /              |  ",
-    "    \\   .-.                     ;  " ,
-    "     '-('' ).-'       ,'       ;   ",
-    "        '-;           |      .'    ",
-    "           \\           \\    /      ",
-    "           | 7  .__  _.-\\   \\      ",
-    "           | |  |  ``/  /`  /      ",
-    "      jgs /,_|  |   /,_/   /       ",
-    "             /,_/      '`-'        ",
-    "                                   ",
- NULL
-};
-
-int main(int argc, char *argv[])
-{
-    Cucul *qq;
-    Caca  *kk;
-    Event ev;
-
-    int x = 0, y = 0, ix = 1, iy = 1;
-
-
-
-    try {
-        qq = new Cucul();
-    }
-    catch (int e) {
-        cerr << "Error while initializing cucul (" << e << ")" << endl;
-        return -1;
-    }
-
-    try {
-        kk = new Caca(qq);
-    }
-    catch(int e) {
-        cerr << "Error while attaching cucul to caca (" << e << ")" << endl;
-        return -1;
-    }
-
-    kk->setDisplayTime(20000);
-
-    while(!kk->getEvent(ev.CACA_EVENT_KEY_PRESS, &ev, 0)) {
-
-        /* Draw pig */
-        qq->setColor(CUCUL_COLOR_LIGHTMAGENTA, CUCUL_COLOR_BLACK);
-
-        for(int i = 0; pig[i]; i++)
-            qq->putStr(x, y+i, (char*)pig[i]);
-
-        /* printf works */
-        qq->setColor(CUCUL_COLOR_LIGHTBLUE, CUCUL_COLOR_BLACK);
-        qq->Printf(30,15, "Powered by libcaca %s", VERSION);
-
-        /* Blit */
-        kk->Display();
-
-        x+=ix;
-        y+=iy;
-
-        if(x>=(qq->getWidth()-35)  || x<0 )
-            ix=-ix;
-        if(y>=(qq->getHeight()-15)   || y<0 )
-            iy=-iy;
-
-
-    }
-
-
-    delete kk;
-    delete qq;
-
-    return 0;
-}
diff --git a/cxx/cxxtest.cpp b/cxx/cxxtest.cpp
index 46e224f..7b9dfc5 100644
--- a/cxx/cxxtest.cpp
+++ b/cxx/cxxtest.cpp
@@ -1,9 +1,9 @@
 /*
- *  cxxtest       libcaca++ rendering test
+ *  cpptest       libcaca++ rendering test
  *  Copyright (c) 2006 Jean-Yves Lamoureux <jylam@lnxscene.org>
  *                All Rights Reserved
  *
- *  $Id: cpptest.cpp 784 2006-06-10 11:35:18Z jylam $
+ *  $Id$
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the Do What The Fuck You Want To
@@ -72,13 +72,13 @@ int main(int argc, char *argv[])
     while(!kk->getEvent(ev.CACA_EVENT_KEY_PRESS, &ev, 0)) {
 
         /* Draw pig */
-        qq->setColor(CUCUL_COLOR_LIGHTMAGENTA, CUCUL_COLOR_BLACK);
+        qq->setColor(CUCUL_LIGHTMAGENTA, CUCUL_BLACK);
 
         for(int i = 0; pig[i]; i++)
             qq->putStr(x, y+i, (char*)pig[i]);
 
         /* printf works */
-        qq->setColor(CUCUL_COLOR_LIGHTBLUE, CUCUL_COLOR_BLACK);
+        qq->setColor(CUCUL_LIGHTBLUE, CUCUL_BLACK);
         qq->Printf(30,15, "Powered by libcaca %s", VERSION);
 
         /* Blit */