From 8b3b63d3111af521dfc0271a84ef6920fab19f69 Mon Sep 17 00:00:00 2001 From: ikemo Date: Fri, 27 Feb 2004 16:17:51 +0000 Subject: [PATCH] remove unused class & reformat git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@895 56b19765-1e22-0410-a548-a0f45d66c51a --- kita/src/libkita/board.cpp | 188 +++++++++++++++++---------------------------- kita/src/libkita/board.h | 100 ++++++++++-------------- 2 files changed, 110 insertions(+), 178 deletions(-) diff --git a/kita/src/libkita/board.cpp b/kita/src/libkita/board.cpp index 508d385..9e440e8 100644 --- a/kita/src/libkita/board.cpp +++ b/kita/src/libkita/board.cpp @@ -1,12 +1,12 @@ /*************************************************************************** - * Copyright (C) 2003 by Hideki Ikemoto * - * ikemo@users.sourceforge.jp * - * * - * This program 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 2 of the License, or * - * (at your option) any later version. * - ***************************************************************************/ +* Copyright (C) 2003 by Hideki Ikemoto * +* ikemo@users.sourceforge.jp * +* * +* This program 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 2 of the License, or * +* (at your option) any later version. * +***************************************************************************/ #include "board.h" @@ -31,86 +31,83 @@ using namespace Kita; QDict* Board::m_boardDict = 0; Board::Board() -{ -} +{} -Board::Board(const QString& boardURL, const QString boardName) : m_boardURL(boardURL), m_boardName(boardName) -{ -} +Board::Board( const QString& boardURL, const QString boardName ) : m_boardURL( boardURL ), m_boardName( boardName ) +{} Board::~Board() -{ -} +{} const KURL Board::subjectTxtURL() const { - if( m_boardURL.isEmpty() ) { - return KURL(); - } else { - return KURL(m_boardURL, "./subject.txt"); - } + if ( m_boardURL.isEmpty() ) { + return KURL(); + } else { + return KURL( m_boardURL, "./subject.txt" ); + } } const QString& Board::url() const { - return m_boardURL; + return m_boardURL; } const QString& Board::name() const { - return m_boardName; + return m_boardName; } const QString Board::id() const { - return KURL( m_boardURL ).fileName(); + return KURL( m_boardURL ).fileName(); } const QPtrList Board::getThreadList() const { - if( m_boardURL.isEmpty() ) { - kdWarning() << "Waring: board url is empty!" << endl; - return QPtrList(); - } - QPtrList threadList; - - KIO::SlaveConfig::self()->setConfigData("http", - KURL( m_boardURL ).host() , - "UserAgent", - QString( "Monazilla/1.00 (Kita/%1)" ).arg( VERSION ) ); - QString tmpFile; - if(KIO::NetAccess::download(subjectTxtURL(), tmpFile)) { - QIODevice* tmpDevice = KFilterDev::deviceForFile(tmpFile, "application/x-gzip"); - tmpDevice->open(IO_ReadOnly); - - QCp932Codec cp932Codec; - QTextStream stream(tmpDevice); - stream.setCodec(&cp932Codec); - - // parse subject.txt(only one format...) - QRegExp regexp("(\\d+\\.dat)<>(.*)\\((\\d+)\\)"); - QString line; - - while((line = stream.readLine()) != QString::null) { - int pos = regexp.search(line); - if(pos != -1) { - QString fname = regexp.cap(1); - QString subject = regexp.cap(2); - QString num = regexp.cap(3); - - KURL datURL = m_boardURL; - datURL.addPath("/dat/" + fname); - Kita::Board::setName( datToBoard( datURL.url() ), name() ); - Kita::Thread::setName( datURL.url(), subject ); - Kita::Thread* thread = Kita::Thread::getByURL( datURL.url() ); - KitaThreadInfo::setResNum( datURL.url(), num.toInt() ); - threadList.append(thread); - } + if ( m_boardURL.isEmpty() ) { + kdWarning() << "Waring: board url is empty!" << endl; + return QPtrList(); } - - KIO::NetAccess::removeTempFile(tmpFile); - } - return threadList; + QPtrList threadList; + + KIO::SlaveConfig::self() ->setConfigData( "http", + KURL( m_boardURL ).host() , + "UserAgent", + QString( "Monazilla/1.00 (Kita/%1)" ).arg( VERSION ) ); + QString tmpFile; + if ( KIO::NetAccess::download( subjectTxtURL(), tmpFile ) ) { + QIODevice * tmpDevice = KFilterDev::deviceForFile( tmpFile, "application/x-gzip" ); + tmpDevice->open( IO_ReadOnly ); + + QCp932Codec cp932Codec; + QTextStream stream( tmpDevice ); + stream.setCodec( &cp932Codec ); + + // parse subject.txt(only one format...) + QRegExp regexp( "(\\d+\\.dat)<>(.*)\\((\\d+)\\)" ); + QString line; + + while ( ( line = stream.readLine() ) != QString::null ) { + int pos = regexp.search( line ); + if ( pos != -1 ) { + QString fname = regexp.cap( 1 ); + QString subject = regexp.cap( 2 ); + QString num = regexp.cap( 3 ); + + KURL datURL = m_boardURL; + datURL.addPath( "/dat/" + fname ); + Kita::Board::setName( datToBoard( datURL.url() ), name() ); + Kita::Thread::setName( datURL.url(), subject ); + Kita::Thread* thread = Kita::Thread::getByURL( datURL.url() ); + KitaThreadInfo::setResNum( datURL.url(), num.toInt() ); + threadList.append( thread ); + } + } + + KIO::NetAccess::removeTempFile( tmpFile ); + } + return threadList; } Board* Board::getByURL( const QString& boardURL ) @@ -125,7 +122,7 @@ Board* Board::getByURL( const QString& boardURL ) m_boardDict = new QDict(); } - if( m_boardDict->find( boardURL ) ) { + if ( m_boardDict->find( boardURL ) ) { return m_boardDict->find( boardURL ); } @@ -138,7 +135,7 @@ Board* Board::getByURL( const QString& boardURL ) void Board::setName( const QString& boardURL, const QString& boardName ) { if ( boardURL.isNull() ) { - return; + return ; } if ( m_boardDict == 0 ) { @@ -147,68 +144,21 @@ void Board::setName( const QString& boardURL, const QString& boardName ) } if ( m_boardDict->find( boardURL ) ) { - m_boardDict->find( boardURL )->m_boardName = boardName; + m_boardDict->find( boardURL ) ->m_boardName = boardName; } else { Board* newBoard = new Board( boardURL, boardName ); m_boardDict->insert( boardURL, newBoard ); } - return; + return ; } const QString& Board::getName( const QString& boardURL ) { - return Board::getByURL( boardURL )->name(); + return Board::getByURL( boardURL ) ->name(); } NullBoard::NullBoard() -{ -} +{} NullBoard::~ NullBoard() -{ -} - -bool BoardXmlParser::startElement( const QString&, const QString& localName, const QString&, const QXmlAttributes& ) -{ - if( m_inBoard == true ) { - if( localName == "url" ) { - } else if( localName == "name" ) { - } else { - // error - return false; - } - } else { - if( localName == "board" ) { - m_inBoard = true; - } else { - // error - return false; - } - } - return true; -} - -bool BoardXmlParser::endElement( const QString&, const QString& localName, const QString& ) -{ - if( localName == "board" ) { - m_inBoard = false; - Kita::Board::setName( m_urlStr, m_nameStr ); - m_board = Kita::Board::getByURL( m_urlStr ); - m_isValid = true; - // create board; - } else if( localName == "url" ) { - m_urlStr = m_characters; - } else if( localName == "name" ) { - m_nameStr = m_characters; - } else { - // error - return false; - } - return true; -} - -bool BoardXmlParser::characters( const QString& ch ) -{ - m_characters = ch; - return true; -} +{} diff --git a/kita/src/libkita/board.h b/kita/src/libkita/board.h index 5a9b6f7..89a608a 100644 --- a/kita/src/libkita/board.h +++ b/kita/src/libkita/board.h @@ -1,12 +1,12 @@ /*************************************************************************** - * Copyright (C) 2003 by Hideki Ikemoto * - * ikemo@users.sourceforge.jp * - * * - * This program 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 2 of the License, or * - * (at your option) any later version. * - ***************************************************************************/ +* Copyright (C) 2003 by Hideki Ikemoto * +* ikemo@users.sourceforge.jp * +* * +* This program 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 2 of the License, or * +* (at your option) any later version. * +***************************************************************************/ #ifndef KITABOARD_H #define KITABOARD_H @@ -23,57 +23,39 @@ @author Hideki Ikemoto */ -namespace Kita { - class Thread; - - class Board - { - QString m_boardURL; - QString m_boardName; - static QDict* m_boardDict; - Board(const QString& boardURL, const QString boardName = QString::null); - protected: - Board(); - public: - ~Board(); - const KURL subjectTxtURL() const; - const QString& url() const; - const QString& name() const; - const QString id() const; - const QPtrList getThreadList() const; - - // Factory method - static Board* getByURL( const QString& boardURL ); - static void setName( const QString& boardURL, const QString& boardName ); - - static const QString& getName( const QString& boardURL ); - }; - - class NullBoard : public Board - { - public: - NullBoard(); - ~NullBoard(); - }; - - class BoardXmlParser : public QXmlDefaultHandler - { - QString m_nameStr; - QString m_urlStr; - - QString m_characters; - Board* m_board; - bool m_inBoard; - bool m_isValid; - public: - BoardXmlParser() : m_inBoard(false), m_isValid(false) {}; - ~BoardXmlParser() {}; - bool startElement( const QString& namespaceURI, const QString& localName, const QString& qName, const QXmlAttributes& atts ); - bool endElement( const QString& namespaceURI, const QString& localName, const QString& qName ); - bool characters( const QString& ch ); - bool isValid() const { return m_isValid; } - Board* getBoard() const { return m_board; } - }; +namespace Kita +{ + class Thread; + + class Board + { + QString m_boardURL; + QString m_boardName; + static QDict* m_boardDict; + Board( const QString& boardURL, const QString boardName = QString::null ); + protected: + Board(); + public: + ~Board(); + const KURL subjectTxtURL() const; + const QString& url() const; + const QString& name() const; + const QString id() const; + const QPtrList getThreadList() const; + + // Factory method + static Board* getByURL( const QString& boardURL ); + static void setName( const QString& boardURL, const QString& boardName ); + + static const QString& getName( const QString& boardURL ); + }; + + class NullBoard : public Board + { + public: + NullBoard(); + ~NullBoard(); + }; }; #endif -- 2.11.0