diff options
author | Sebastien Helleu <flashcode@flashtux.org> | 2011-11-03 16:06:15 +0100 |
---|---|---|
committer | Sebastien Helleu <flashcode@flashtux.org> | 2011-11-03 16:06:15 +0100 |
commit | 4b1bc5ff1b711e1c3673c8ed5ea945ede32f491c (patch) | |
tree | 0246af8f82c88909b8aa91c2111af7bb0494e07d | |
parent | e62cf7c57d443682ce3308e4bb58238b98414fac (diff) | |
download | weechat-4b1bc5ff1b711e1c3673c8ed5ea945ede32f491c.zip |
core: remove obsolete/empty sources for Qt and Wxwidgets
-rw-r--r-- | README | 9 | ||||
-rw-r--r-- | configure.in | 39 | ||||
-rw-r--r-- | doc/de/weechat_user.de.txt | 1 | ||||
-rw-r--r-- | doc/en/weechat_user.en.txt | 1 | ||||
-rw-r--r-- | doc/fr/weechat_user.fr.txt | 1 | ||||
-rw-r--r-- | doc/it/weechat_user.it.txt | 1 | ||||
-rw-r--r-- | po/POTFILES.in | 4 | ||||
-rw-r--r-- | po/srcfiles.cmake | 4 | ||||
-rw-r--r-- | src/gui/Makefile.am | 10 | ||||
-rw-r--r-- | src/gui/qt/Makefile.am | 21 | ||||
-rw-r--r-- | src/gui/qt/gui-qt.c | 22 | ||||
-rw-r--r-- | src/gui/qt/gui-qt.h | 23 | ||||
-rw-r--r-- | src/gui/wxwidgets/Makefile.am | 31 | ||||
-rw-r--r-- | src/gui/wxwidgets/gui-display.c | 21 | ||||
-rw-r--r-- | src/gui/wxwidgets/gui-input.c | 21 |
15 files changed, 4 insertions, 205 deletions
@@ -11,18 +11,13 @@ Features -------- * chat client with multi-protocols/servers connection -* many GUI (curses, Gtk, Qt) (1) * small, fast and very light -* customizable and extensible with plugins (C, Perl, Python, Ruby, Lua, Tcl) +* customizable and extensible with plugins (C, Perl, Python, Ruby, Lua, Tcl, Guile) * compliant with IRC RFCs 1459, 2810, 2811, 2812 and 2813 * developed from scratch -* multi-platform (GNU/Linux, *BSD, Mac OS X, QNX, Windows & other) (2) +* multi-platform (GNU/Linux, *BSD, Mac OS X, QNX, Windows & other) * free software, released under GPLv3 -NOTE: (1) only Curses interface is available today - + - (2) Windows version is under construction - Copyright --------- diff --git a/configure.in b/configure.in index fe186c8ff..cdcb40ee9 100644 --- a/configure.in +++ b/configure.in @@ -129,9 +129,7 @@ AH_VERBATIM([WEECHAT_HOME], [#define WEECHAT_HOME "~/.weechat"]) # Arguments for ./configure AC_ARG_ENABLE(ncurses, [ --disable-ncurses turn off ncurses interface (default=compiled if found)],enable_ncurses=$enableval,enable_ncurses=yes) -AC_ARG_ENABLE(wxwidgets, [ --enable-wxwidgets turn on WxWidgets interface (default=off)],enable_wxwidgets=$enableval,enable_wxwidgets=no) AC_ARG_ENABLE(gtk, [ --enable-gtk turn on Gtk interface (default=off)],enable_gtk=$enableval,enable_gtk=no) -AC_ARG_ENABLE(qt, [ --enable-qt turn on Qt interface (default=off)],enable_qt=$enableval,enable_qt=no) AC_ARG_ENABLE(gcrypt, [ --disable-gcrypt turn off gcrypt support (default=compiled if found)],enable_gcrypt=$enableval,enable_gcrypt=yes) AC_ARG_ENABLE(gnutls, [ --disable-gnutls turn off gnutls support (default=compiled if found)],enable_gnutls=$enableval,enable_gnutls=yes) AC_ARG_ENABLE(largefile, [ --disable-largefile turn off Large File Support (default=on)],enable_largefile=$enableval,enable_largefile=yes) @@ -213,31 +211,6 @@ else not_asked="$not_asked ncurses" fi -#if test "x$enable_wxwidgets" = "xyes" ; then -# AM_OPTIONS_WXCONFIG -# AM_PATH_WXCONFIG(2.3.4, wxWin=1) -# -# if test "$wxWin" != 1; then -# AC_MSG_ERROR([ -#*** wxWindows must be installed on your system -#*** but wx-config script couldn't be found. -# -#*** Please check that wx-config is in path, the directory -#*** where wxWindows libraries are installed (returned by -#*** 'wx-config --libs' command) is in LD_LIBRARY_PATH or -#*** equivalent variable and wxWindows version is 2.3.4 or above. -# ]) -# fi -# -# CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" -# CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" -# CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" -# LDFLAGS="$LDFLAGS $WX_LIBS" -# -# WXWIDGETS_CFLAGS="" -# WXWIDGETS_LIBS="" -#fi - if test "x$enable_gtk" = "xyes" ; then AM_PATH_GTK_2_0(2.4.0, LIBGTK_FOUND=1, LIBGTK_FOUND=0) if test "$LIBGTK_FOUND" = "0" ; then @@ -1051,9 +1024,7 @@ AM_CONDITIONAL(HAVE_GNUTLS, test "$enable_gnutls" = "yes") AM_CONDITIONAL(HAVE_FLOCK, test "$enable_flock" = "yes") AM_CONDITIONAL(HAVE_EAT_NEWLINE_GLITCH, test "$enable_eatnewlineglitch" = "yes") AM_CONDITIONAL(GUI_NCURSES, test "$enable_ncurses" = "yes") -AM_CONDITIONAL(GUI_WXWIDGETS, test "$enable_wxwidgets" = "yes") AM_CONDITIONAL(GUI_GTK, test "$enable_gtk" = "yes") -AM_CONDITIONAL(GUI_QT, test "$enable_qt" = "yes") AM_CONDITIONAL(PLUGIN_ALIAS, test "$enable_alias" = "yes") AM_CONDITIONAL(PLUGIN_ASPELL, test "$enable_aspell" = "yes") AM_CONDITIONAL(PLUGIN_CHARSET, test "$enable_charset" = "yes") @@ -1103,9 +1074,7 @@ AC_OUTPUT([Makefile src/plugins/xfer/Makefile src/gui/Makefile src/gui/curses/Makefile - src/gui/wxwidgets/Makefile src/gui/gtk/Makefile - src/gui/qt/Makefile intl/Makefile po/Makefile.in]) @@ -1117,20 +1086,14 @@ listgui="" if test "x$enable_ncurses" = "xyes" ; then listgui="$listgui ncurses" fi -if test "x$enable_wxwidgets" = "xyes"; then - listgui="$listgui wxwidgets" -fi if test "x$enable_gtk" = "xyes" ; then listgui="$listgui gtk" fi -if test "x$enable_qt" = "xyes" ; then - listgui="$listgui qt" -fi if test "x$listgui" = "x" ; then AC_MSG_ERROR([ *** No interface specified... -*** Please enable at least ncurses, WxWidgets, Gtk or Qt.]) +*** Please enable at least ncurses or gtk.]) fi listplugins="" diff --git a/doc/de/weechat_user.de.txt b/doc/de/weechat_user.de.txt index 0d53b9c6a..899d299cf 100644 --- a/doc/de/weechat_user.de.txt +++ b/doc/de/weechat_user.de.txt @@ -24,7 +24,6 @@ wesentliche Merkmale: * Multi-Protokoll fähig (IRC, Jabber) * Multi-Server Verbindungen (mittels SSL, IPv6, proxy) -* verschiedene GUIs: Curses (wxWidgets, Gtk und Qt sind in der Entwicklung) * klein, schnell und schlank * den eigenen persönlichen Bedürfnissen anpassbar und durch Erweiterungen und Skripten in der Funktionalität erweiterbar * IRC RFCs konform http://www.ietf.org/rfc/rfc1459.txt[1459], diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt index 04e9e4357..7ae9caa5d 100644 --- a/doc/en/weechat_user.en.txt +++ b/doc/en/weechat_user.en.txt @@ -24,7 +24,6 @@ Main features are: * multi-protocols (IRC, Jabber) * multi-servers connection (with SSL, IPv6, proxy) -* many GUI: Curses (wxWidgets, Gtk and Qt under development) * small, fast and light * customizable and extensible with plugins and scripts * compliant with IRC RFCs http://www.ietf.org/rfc/rfc1459.txt[1459], diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt index 641c57633..5d965e8a1 100644 --- a/doc/fr/weechat_user.fr.txt +++ b/doc/fr/weechat_user.fr.txt @@ -25,7 +25,6 @@ Ses principales fonctionnalités sont les suivantes : * multi-protocoles (IRC, Jabber) * connexion multi-serveurs (avec SSL, IPv6, proxy) -* plusieurs interfaces : Curses (wxWidgets, Gtk et Qt en développement) * petit, rapide et léger * paramétrable et extensible avec des extensions et des scripts * conforme aux RFCs IRC http://www.ietf.org/rfc/rfc1459.txt[1459], diff --git a/doc/it/weechat_user.it.txt b/doc/it/weechat_user.it.txt index c9ec6f63f..8787c4573 100644 --- a/doc/it/weechat_user.it.txt +++ b/doc/it/weechat_user.it.txt @@ -25,7 +25,6 @@ Le principali caratteristiche: * multi-protocollo (IRC, Jabber) * connessione a server multipli (con SSL, IPv6, proxy) -* interfacce multiple: Curses (wxWidgets, Gtk e Qt in fase di sviluppo) * piccolo, veloce e leggero * personalizzabile ed estensibile con plugin e script * conforme alle RFC di IRC http://www.ietf.org/rfc/rfc1459.txt[1459], diff --git a/po/POTFILES.in b/po/POTFILES.in index 0ec6a5cd7..ee72a4250 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -91,10 +91,6 @@ ./src/gui/gui-nicklist.h ./src/gui/gui-window.c ./src/gui/gui-window.h -./src/gui/qt/gui-qt.c -./src/gui/qt/gui-qt.h -./src/gui/wxwidgets/gui-display.c -./src/gui/wxwidgets/gui-input.c ./src/plugins/alias/alias.c ./src/plugins/alias/alias.h ./src/plugins/alias/alias-config.c diff --git a/po/srcfiles.cmake b/po/srcfiles.cmake index 6923c4548..03a25946e 100644 --- a/po/srcfiles.cmake +++ b/po/srcfiles.cmake @@ -92,10 +92,6 @@ SET(WEECHAT_SOURCES ./src/gui/gui-nicklist.h ./src/gui/gui-window.c ./src/gui/gui-window.h -./src/gui/qt/gui-qt.c -./src/gui/qt/gui-qt.h -./src/gui/wxwidgets/gui-display.c -./src/gui/wxwidgets/gui-input.c ./src/plugins/alias/alias.c ./src/plugins/alias/alias.h ./src/plugins/alias/alias-config.c diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 92fc75a81..30ea8ff95 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -65,18 +65,10 @@ if GUI_NCURSES curses_dir=curses endif -if GUI_WXWIDGETS -wxwidgets_dir=wxwidgets -endif - if GUI_GTK gtk_dir=gtk endif -if GUI_QT -qt_dir=qt -endif - -SUBDIRS = . $(curses_dir) $(wxwidgets_dir) $(gtk_dir) $(qt_dir) +SUBDIRS = . $(curses_dir) $(gtk_dir) EXTRA_DIST = CMakeLists.txt diff --git a/src/gui/qt/Makefile.am b/src/gui/qt/Makefile.am deleted file mode 100644 index 88b862562..000000000 --- a/src/gui/qt/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org> -# -# This file is part of WeeChat, the extensible chat client. -# -# WeeChat is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# WeeChat is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with WeeChat. If not, see <http://www.gnu.org/licenses/>. -# - -EXTRA_DIST = gui-qt.c \ - gui-qt.h diff --git a/src/gui/qt/gui-qt.c b/src/gui/qt/gui-qt.c deleted file mode 100644 index 5cfc1dc43..000000000 --- a/src/gui/qt/gui-qt.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org> - * - * This file is part of WeeChat, the extensible chat client. - * - * WeeChat is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * WeeChat is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with WeeChat. If not, see <http://www.gnu.org/licenses/>. - */ - -/* gui-qt.c: Qt GUI for WeeChat */ - -/* ***** Qt GUI for WeeChat, NOT developed! ***** */ diff --git a/src/gui/qt/gui-qt.h b/src/gui/qt/gui-qt.h deleted file mode 100644 index 64a81bebf..000000000 --- a/src/gui/qt/gui-qt.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2003-2011 Sebastien Helleu <flashcode@flashtux.org> - * - * This file is part of WeeChat, the extensible chat client. - * - * WeeChat is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * WeeChat is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with WeeChat. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef __WEECHAT_GUI_QT_H -#define __WEECHAT_GUI_QT_H 1 - -#endif /* __WEECHAT_GUI_QT_H */ diff --git a/src/gui/wxwidgets/Makefile.am b/src/gui/wxwidgets/Makefile.am deleted file mode 100644 index f084b6433..000000000 --- a/src/gui/wxwidgets/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright (C) 2005 Benoit Papillault <benoit.papillault@free.fr> -# Copyright (C) 2005-2011 Sebastien Helleu <flashcode@flashtux.org> -# -# This file is part of WeeChat, the extensible chat client. -# -# WeeChat is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# WeeChat is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with WeeChat. If not, see <http://www.gnu.org/licenses/>. -# - -INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" - -bin_PROGRAMS = weechat-wxwidgets - -weechat_wxwidgets_LDADD = ../lib_weechat_gui_common.a \ - ../../common/lib_weechat_main.a \ - ../../irc/lib_weechat_irc.a \ - ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS) - -weechat_wxwidgets_SOURCES = gui-display.c \ - gui-input.c diff --git a/src/gui/wxwidgets/gui-display.c b/src/gui/wxwidgets/gui-display.c deleted file mode 100644 index 48284b89f..000000000 --- a/src/gui/wxwidgets/gui-display.c +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2005 Benoit Papillault <benoit.papillault@free.fr> - * Copyright (C) 2005-2011 Sebastien Helleu <flashcode@flashtux.org> - * - * This file is part of WeeChat, the extensible chat client. - * - * WeeChat is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * WeeChat is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with WeeChat. If not, see <http://www.gnu.org/licenses/>. - */ - -/* gui-display.c: display functions for wxWidgets GUI */ diff --git a/src/gui/wxwidgets/gui-input.c b/src/gui/wxwidgets/gui-input.c deleted file mode 100644 index 85b4288ca..000000000 --- a/src/gui/wxwidgets/gui-input.c +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2005 Benoit Papillault <benoit.papillault@free.fr> - * Copyright (C) 2005-2011 Sebastien Helleu <flashcode@flashtux.org> - * - * This file is part of WeeChat, the extensible chat client. - * - * WeeChat is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * WeeChat is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with WeeChat. If not, see <http://www.gnu.org/licenses/>. - */ - -/* gui-input: user input functions for wxWidgets GUI */ |