Merged revisions 97753 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r97753 | russell | 2008-01-10 10:19:47 -0600 (Thu, 10 Jan 2008) | 2 lines

Remove other remnants of pbx_kdeconsole

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@97758 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/modules.conf.sample b/configs/modules.conf.sample
index 0fee961..2ca3c03 100644 (file)
--- a/configs/modules.conf.sample
+++ b/configs/modules.conf.sample
@@ -25,12 +25,9 @@ preload => func_strings.so
 ;preload => res_speech.so
 ;
 ; If you want, load the GTK console right away.  
-; Don't load the KDE console since
-; it's not as sophisticated right now.
 ;
 noload => pbx_gtkconsole.so
 ;load => pbx_gtkconsole.so
-noload => pbx_kdeconsole.so
 ;
 load => res_musiconhold.so
 ;

diff --git a/pbx/kdeconsole_main.cc b/pbx/kdeconsole_main.cc
deleted file mode 100644 (file)
index 0bb2d73..0000000
--- a/pbx/kdeconsole_main.cc
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Asterisk -- A telephony toolkit for Linux.
- *
- * KDE Console monitor -- Mostly glue code
- * 
- * Copyright (C) 1999, Mark Spencer
- *
- * Mark Spencer <markster@linux-support.net>
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License
- */
-
-#include "asterisk/module.h"
-#include "asterisk/channel.h"
-#include "asterisk/logger.h"
-#include "asterisk/lock.h"
-#include "pbx_kdeconsole.h"
-
-static char *dtext = "KDE Console Monitor";
-
-static int inuse = 0;
-
-static KAsteriskConsole *w;
-
-static void verboser(char *stuff, int opos, int replacelast, int complete)
-{
-       const char *s2[2];
-       s2[0] = stuff;
-       s2[1] = NULL;
-       if (replacelast)  {
-               printf("Removing %d\n", w->verbose->count());
-               w->verbose->removeItem(w->verbose->count());
-       }
-       w->verbose->insertStrList(s2, 1, -1);
-       w->verbose->setBottomItem(w->verbose->count());
-}
-
-static int kde_main(int argc, char *argv[])
-{
-       KApplication a ( argc, argv );
-       w = new KAsteriskConsole();
-       a.setMainWidget(w);
-       w->show();
-       ast_register_verbose(verboser);
-       return a.exec();
-}
-
-static void *kdemain(void *data)
-{
-       /* It would appear kde really wants to be main */;
-       char *argv[1] = { "asteriskconsole" };
-       kde_main(1, argv);
-       return NULL;
-}
-
-extern "C" {
-
-int unload_module(void)
-{
-       return inuse;
-}
-
-int load_module(void)
-{
-       pthread_t t;
-       pthread_create(&t, NULL, kdemain, NULL);
-       return 0;
-}
-
-int usecount(void)
-{
-       return inuse;
-}
-
-char *description(void)
-{
-       return dtext;
-}
-
-}

diff --git a/pbx/pbx_kdeconsole.h b/pbx/pbx_kdeconsole.h
deleted file mode 100644 (file)
index df73ab3..0000000
--- a/pbx/pbx_kdeconsole.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Asterisk -- A telephony toolkit for Linux.
- *
- * KDE Console monitor -- Header file
- * 
- * Copyright (C) 1999, Mark Spencer
- *
- * Mark Spencer <markster@linux-support.net>
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License
- */
-
-#include <kapp.h>
-#include <ktmainwindow.h>
-#include <qpushbutton.h>
-#include <kmenubar.h>
-#include <qpopupmenu.h>
-#include <qlistbox.h>
-#include <qlayout.h>
-#include <qframe.h>
-
-class KAsteriskConsole : public KTMainWindow
-{
-       Q_OBJECT
-public:
-       KAsteriskConsole();
-       void closeEvent(QCloseEvent *);
-       QListBox *verbose;
-public slots:
-       void slotExit();
-private:
-       void KAsteriskConsole::verboser(char *stuff, int opos, int replacelast, int complete);
-       QPushButton *btnExit;
-       KMenuBar *menu;
-       QPopupMenu *file, *help;
-};