diff options
Diffstat (limited to 'src')
52 files changed, 623 insertions, 482 deletions
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp index 2b9b34f11..bbc1dcfd8 100644 --- a/src/modules/http/httpfiletransfer.cpp +++ b/src/modules/http/httpfiletransfer.cpp @@ -486,4 +486,7 @@ bool KviHttpFileTransfer::startDownload() return m_pHttpRequest->start(); } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_httpfiletransfer.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp index 551395a24..38afdefb1 100644 --- a/src/modules/ident/libkviident.cpp +++ b/src/modules/ident/libkviident.cpp @@ -612,4 +612,7 @@ KVIRC_MODULE( ident_module_cleanup ) +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "libkviident.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp index 718df2360..920b0f412 100644 --- a/src/modules/lamerizer/libkvilamerizer.cpp +++ b/src/modules/lamerizer/libkvilamerizer.cpp @@ -275,5 +275,8 @@ KVIRC_MODULE( ) #ifdef COMPILE_CRYPT_SUPPORT - #include "libkvilamerizer.moc" + #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES + #include "libkvilamerizer.moc" + #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES #endif + diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp index a9ccdad90..854855206 100644 --- a/src/modules/links/linkswindow.cpp +++ b/src/modules/links/linkswindow.cpp @@ -469,4 +469,7 @@ void KviLinksWindow::applyOptions() KviWindow::applyOptions(); } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_linkswindow.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp index 2e800f40d..4ec8c8721 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -532,4 +532,7 @@ void KviListWindow::applyOptions() KviWindow::applyOptions(); } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "listwindow.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index 8571761cb..1e029a538 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -1,477 +1,480 @@ -//
-// File : logviewmdiwindow.cpp
-// Creation date : Tue Apr 23 2002 18:08:22 by Juanjo �varez
-//
-// This file is part of the KVirc irc client distribution
-// Copyright (C) 1999-2000 Szymon Stefanek (pragma at kvirc dot net)
-//
-// 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 opinion) any later version.
-//
-// This program 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 this program. If not, write to the Free Software Foundation,
-// Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-
-#include "logviewmdiwindow.h"
-#include "logviewwidget.h"
-#include "kvi_iconmanager.h"
-#include "kvi_locale.h"
-#include "kvi_module.h"
-#include "kvi_options.h"
-#include "kvi_frame.h"
-#include "kvi_ircview.h"
-#include "kvi_qstring.h"
-#include "kvi_qcstring.h"
-#include "kvi_app.h"
-#include "kvi_fileutils.h"
-#ifdef COMPILE_USE_QT4
- #include <q3progressdialog.h>
-#else
- #include <qprogressdialog.h>
-#endif
+// +// File : logviewmdiwindow.cpp +// Creation date : Tue Apr 23 2002 18:08:22 by Juanjo �varez +// +// This file is part of the KVirc irc client distribution +// Copyright (C) 1999-2000 Szymon Stefanek (pragma at kvirc dot net) +// +// 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 opinion) any later version. +// +// This program 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 this program. If not, write to the Free Software Foundation, +// Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// + +#include "logviewmdiwindow.h" +#include "logviewwidget.h" +#include "kvi_iconmanager.h" +#include "kvi_locale.h" +#include "kvi_module.h" +#include "kvi_options.h" +#include "kvi_frame.h" +#include "kvi_ircview.h" +#include "kvi_qstring.h" +#include "kvi_qcstring.h" +#include "kvi_app.h" +#include "kvi_fileutils.h" +#ifdef COMPILE_USE_QT4 + #include <q3progressdialog.h> +#else + #include <qprogressdialog.h> +#endif #include "kvi_valuelist.h" #include "kvi_accel.h" -#include <qpixmap.h>
-#include <qsplitter.h>
-#include <qtoolbutton.h>
-#include "kvi_tal_listview.h"
-#include <qfileinfo.h>
-#include <qdir.h>
-#include "kvi_tal_popupmenu.h"
-#include <qcursor.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-
-
-
-#ifdef COMPILE_ZLIB_SUPPORT
- #include <zlib.h>
-#endif
-#include <qtextcodec.h>
-#include "kvi_styled_controls.h"
-#include <qdatetimeedit.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-
-extern KviLogViewMDIWindow * g_pLogViewWindow;
-
-KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFrame * lpFrm)
-: KviWindow(KVI_WINDOW_TYPE_LOGVIEW,lpFrm,"logview"), KviModuleExtension(d)
-{
- g_pLogViewWindow = this;
-// m_pLogViewWidget = new KviLogViewWidget(this);
+#include <qpixmap.h> +#include <qsplitter.h> +#include <qtoolbutton.h> +#include "kvi_tal_listview.h" +#include <qfileinfo.h> +#include <qdir.h> +#include "kvi_tal_popupmenu.h" +#include <qcursor.h> +#include <qlayout.h> +#include <qpushbutton.h> + + + +#ifdef COMPILE_ZLIB_SUPPORT + #include <zlib.h> +#endif +#include <qtextcodec.h> +#include "kvi_styled_controls.h" +#include <qdatetimeedit.h> +#include <qlineedit.h> +#include <qlabel.h> + +extern KviLogViewMDIWindow * g_pLogViewWindow; + +KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFrame * lpFrm) +: KviWindow(KVI_WINDOW_TYPE_LOGVIEW,lpFrm,"logview"), KviModuleExtension(d) +{ + g_pLogViewWindow = this; +// m_pLogViewWidget = new KviLogViewWidget(this); #ifdef COMPILE_USE_QT4 m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter"); -#else
- m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter");
-#endif
- m_pTabWidget = new QTabWidget(m_pSplitter);
-
- m_pIndexTab = new KviTalVBox(m_pTabWidget);
- m_pTabWidget->insertTab(m_pIndexTab,__tr2qs_ctx("Index","logview"));
- m_pListView = new KviTalListView(m_pIndexTab);
- m_pListView->addColumn(__tr2qs_ctx("Log File","logview"),135);
- m_pListView->setColumnWidthMode(0,KviTalListView::Maximum);
- m_pListView->setAllColumnsShowFocus(true);
- m_pListView->setMultiSelection(false);
- m_pListView->setShowSortIndicator(true);
- m_pListView->setRootIsDecorated(true);
- connect(m_pListView,SIGNAL(selectionChanged(KviTalListViewItem *)),this,SLOT(itemSelected(KviTalListViewItem *)));
- connect(m_pListView,SIGNAL(rightButtonClicked ( KviTalListViewItem * , const QPoint &, int )),this,SLOT(rightButtonClicked ( KviTalListViewItem * , const QPoint &, int )));
-
- m_pSearchTab = new QWidget(m_pTabWidget);
- m_pTabWidget->insertTab(m_pSearchTab,__tr2qs_ctx("Filter","logview"));
-
- QGridLayout *layout = new QGridLayout(m_pSearchTab,10,2,3,5);
-
- m_pShowChannelsCheck = new KviStyledCheckBox(__tr2qs_ctx("Show channel logs","logview"),m_pSearchTab);
- m_pShowChannelsCheck->setChecked(true);
- layout->addMultiCellWidget(m_pShowChannelsCheck,0,0,0,1);
-
- m_pShowQueryesCheck = new KviStyledCheckBox(__tr2qs_ctx("Show query logs","logview"),m_pSearchTab);
- m_pShowQueryesCheck->setChecked(true);
- layout->addMultiCellWidget(m_pShowQueryesCheck,1,1,0,1);
-
- m_pShowConsolesCheck = new KviStyledCheckBox(__tr2qs_ctx("Show console logs","logview"),m_pSearchTab);
- m_pShowConsolesCheck->setChecked(true);
- layout->addMultiCellWidget(m_pShowConsolesCheck,2,2,0,1);
-
- m_pShowDccChatCheck = new KviStyledCheckBox(__tr2qs_ctx("Show DCC chat logs","logview"),m_pSearchTab);
- m_pShowDccChatCheck->setChecked(true);
- layout->addMultiCellWidget(m_pShowDccChatCheck,3,3,0,1);
-
- m_pShowOtherCheck = new KviStyledCheckBox(__tr2qs_ctx("Show other logs","logview"),m_pSearchTab);
- m_pShowOtherCheck->setChecked(true);
- layout->addMultiCellWidget(m_pShowOtherCheck,4,4,0,1);
-
- QLabel *l;
- l = new QLabel(__tr2qs_ctx("Contents filter","logview"),m_pSearchTab);
- layout->addMultiCellWidget(l,5,5,0,1);
-
- l = new QLabel(__tr2qs_ctx("Log name mask:","logview"),m_pSearchTab);
- m_pFileNameMask = new QLineEdit(m_pSearchTab);
- connect(m_pFileNameMask,SIGNAL(returnPressed()),this,SLOT(applyFilter()));
- layout->addWidget(l,6,0);
- layout->addWidget(m_pFileNameMask,6,1);
-
- l = new QLabel(__tr2qs_ctx("Log contents mask:","logview"),m_pSearchTab);
- m_pContentsMask = new QLineEdit(m_pSearchTab);
- connect(m_pContentsMask,SIGNAL(returnPressed()),this,SLOT(applyFilter()));
- layout->addWidget(l,7,0);
- layout->addWidget(m_pContentsMask,7,1);
-
- m_pEnableFromFilter = new KviStyledCheckBox(__tr2qs_ctx("Only older than","logview"),m_pSearchTab);
- m_pFromDateEdit = new QDateEdit(m_pSearchTab);
- m_pFromDateEdit->setDate(QDate::currentDate());
- layout->addWidget(m_pEnableFromFilter,8,0);
- layout->addWidget(m_pFromDateEdit,8,1);
- connect(m_pEnableFromFilter,SIGNAL(toggled(bool)),m_pFromDateEdit,SLOT(setEnabled(bool)));
- m_pFromDateEdit->setEnabled(false);
-
- m_pEnableToFilter = new KviStyledCheckBox(__tr2qs_ctx("Only newier than","logview"),m_pSearchTab);
- m_pToDateEdit = new QDateEdit(m_pSearchTab);
- m_pToDateEdit->setDate(QDate::currentDate());
- layout->addWidget(m_pEnableToFilter,9,0);
- layout->addWidget(m_pToDateEdit,9,1);
- connect(m_pEnableToFilter,SIGNAL(toggled(bool)),m_pToDateEdit,SLOT(setEnabled(bool)));
- m_pToDateEdit->setEnabled(false);
-
- QPushButton *pb = new QPushButton(__tr2qs_ctx("Apply filter","logview"),m_pSearchTab);
- connect(pb,SIGNAL(clicked()),this,SLOT(applyFilter()));
- layout->addWidget(pb,10,1);
-
- QWidget *w = new QWidget(m_pSearchTab);
- w->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored);
- layout->addWidget(w,11,1);
-
- m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this);
-#ifdef COMPILE_USE_QT4
- m_pIrcView->setFocusPolicy(Qt::ClickFocus);
-#else
- m_pIrcView->setFocusPolicy(QWidget::ClickFocus);
-#endif
- KviValueList<int> li;
- li.append(110);
- li.append(width()-110);
- m_pSplitter->setSizes(li);
-
- g_pApp->getLocalKvircDirectory(m_szLogDirectory,KviApp::Log);
- KviQString::ensureLastCharIs(m_szLogDirectory,'/'); // Does this work on Windows?
-
- cacheFileList();
- setupItemList();
- KviAccel *a = new KviAccel( this );
- a->connectItem( a->insertItem(Qt::Key_F+Qt::CTRL),
- m_pIrcView,
- SLOT(toggleToolWidget()) );
-}
-
-
-
-KviLogViewMDIWindow::~KviLogViewMDIWindow()
-{
- g_pLogViewWindow = 0;
-}
-
-void KviLogViewMDIWindow::applyFilter()
-{
- setupItemList();
-}
-
-
-QPixmap * KviLogViewMDIWindow::myIconPtr()
-{
- return g_pIconManager->getSmallIcon(KVI_SMALLICON_LOG);
-}
-
-
-void KviLogViewMDIWindow::resizeEvent(QResizeEvent *e)
-{
- m_pSplitter->setGeometry(0,0,width(),height());
-}
-
-void KviLogViewMDIWindow::fillCaptionBuffers()
-{
- m_szPlainTextCaption = __tr2qs_ctx("Log Viewer","logview");
-
- m_szHtmlActiveCaption = QString("<nobr><font color=\"%1\"><b>").arg(KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii());
- m_szHtmlActiveCaption.append(m_szPlainTextCaption);
- m_szHtmlActiveCaption.append("</b></font></nobr>");
-
- m_szHtmlInactiveCaption = QString("<nobr><font color=\"%1\"><b>").arg(KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii());
- m_szHtmlInactiveCaption.append(m_szPlainTextCaption);
- m_szHtmlInactiveCaption.append("</b></font></nobr>");
-}
-
-void KviLogViewMDIWindow::die()
-{
- close();
-}
-
-QSize KviLogViewMDIWindow::sizeHint() const
-{
- QSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height());
- return ret;
-}
-
-void KviLogViewMDIWindow::setupItemList()
-{
- m_pListView->clear();
- KviLogFile *pFile;
- //m_logList.begin();
- KviLogListViewItem *pLastCategory=0;
- KviLogListViewItemFolder *pLastGroupItem;
- QString szLastGroup;
- QString szCurGroup;
- const bool bShowChannel=m_pShowChannelsCheck->isChecked();
- const bool bShowQuery=m_pShowQueryesCheck->isChecked();
- const bool bShowConsole=m_pShowConsolesCheck->isChecked();
- const bool bShowOther=m_pShowOtherCheck->isChecked();
- const bool bShowDccChat=m_pShowDccChatCheck->isChecked();
-
- const bool filterFromDate=m_pEnableFromFilter->isChecked();
- const bool filterToDate=m_pEnableToFilter->isChecked();
-
- const QString nameFilterText = m_pFileNameMask->text();
- const bool enableNameFilter = !nameFilterText.isEmpty();
-
- const QString contentFilterText = m_pContentsMask->text();
- const bool enableContentFilter = !contentFilterText.isEmpty();
-
- QDate fromDate = m_pFromDateEdit->date();
- QDate toDate = m_pToDateEdit->date();
-
- QString textBuffer;
-#ifdef COMPILE_USE_QT4
- Q3ProgressDialog progress( __tr2qs_ctx("Filtering files...","logview"),
- __tr2qs_ctx("Abort filtering","logview"), m_logList.count(),
- this, "progress", TRUE );
-#else
- QProgressDialog progress( __tr2qs_ctx("Filtering files...","logview"),
- __tr2qs_ctx("Abort filtering","logview"), m_logList.count(),
- this, "progress", TRUE );
-#endif
-
-
- int i=0;
- for(pFile=m_logList.first();pFile;pFile=m_logList.next())
- {
- progress.setProgress( i );
- i++;
- g_pApp->processEvents();
-
- if ( progress.wasCanceled() )
- break;
-
- if(pFile->type()==KviLogFile::Channel && !bShowChannel)
- continue;
- if(pFile->type()==KviLogFile::Console && !bShowConsole)
- continue;
- if(pFile->type()==KviLogFile::DccChat && !bShowDccChat)
- continue;
- if(pFile->type()==KviLogFile::Other && !bShowOther)
- continue;
- if(pFile->type()==KviLogFile::Query && !bShowQuery)
- continue;
-
- if(filterFromDate)
- if(pFile->date()<fromDate)
- continue;
-
- if(filterToDate)
- if(pFile->date()>toDate)
- continue;
-
- if(enableNameFilter)
- if(!KviQString::matchStringCI(nameFilterText,pFile->name()))
- continue;
-
- if(enableContentFilter)
- {
- pFile->getText(textBuffer,m_szLogDirectory);
- if(!KviQString::matchStringCI(contentFilterText,textBuffer))
- continue;
- }
-
- if(pLastCategory)
- {
- if(pLastCategory->m_type!=pFile->type())
- pLastCategory = new KviLogListViewItemType(m_pListView,pFile->type());
- } else {
- pLastCategory = new KviLogListViewItemType(m_pListView,pFile->type());
- }
-
- KviQString::sprintf(szCurGroup,__tr2qs_ctx("%Q on %Q","logview"),&(pFile->name()),
- &(pFile->network())
- );
-
- if(szLastGroup!=szCurGroup) {
- szLastGroup=szCurGroup;
- pLastGroupItem=new KviLogListViewItemFolder(pLastCategory,szLastGroup);
- }
- new KviLogListViewLog(pLastGroupItem,pFile->type(),pFile);
- }
- progress.setProgress( m_logList.count() );
-}
-
-void KviLogViewMDIWindow::cacheFileList()
-{
- QStringList m_pFileNames = getFileNames();
- m_pFileNames.sort();
- QString szFname;
-
- for(QStringList::Iterator it = m_pFileNames.begin(); it != m_pFileNames.end(); ++it)
- {
- szFname=(*it);
- QFileInfo fi(szFname);
- if(fi.extension(false)=="gz" || fi.extension(false)=="log")
- m_logList.append(new KviLogFile(szFname));
- }
-}
-
-void KviLogViewMDIWindow::itemSelected(KviTalListViewItem * it)
-{
- bool bCompressed=0;
- //A parent node
- m_pIrcView->clearBuffer();
- if(!it || !it->parent() || !(((KviLogListViewItem *)it)->m_pFileData) )
- {
- return;
- }
-
- QString text;
- ((KviLogListViewItem *)it)->m_pFileData->getText(text,m_szLogDirectory);
-
- QStringList lines=QStringList::split('\n',text);
- bool bOk;
- int iMsgType;
- for ( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) {
- QString num=(*it).section(' ',0,0);
- iMsgType=num.toInt(&bOk);
- if(bOk)
- outputNoFmt(iMsgType,(*it).section(' ',1),KviIrcView::NoRepaint | KviIrcView::NoTimestamp);
- else
- outputNoFmt(0,*it,KviIrcView::NoRepaint | KviIrcView::NoTimestamp);
- }
- m_pIrcView->repaint(false);
-}
-
-QStringList KviLogViewMDIWindow::getFileNames()
-{
- QString logPath;
- g_pApp->getLocalKvircDirectory(logPath,KviApp::Log);
- QString qPath(logPath);
- QDir logDir(qPath);
- return logDir.entryList();
-}
-
-void KviLogViewMDIWindow::rightButtonClicked ( KviTalListViewItem * it, const QPoint &, int )
-{
- if(!it) return;
- if(((KviLogListViewItem *)it)->fileName(0).isEmpty()) return;
- KviTalPopupMenu* popup = new KviTalPopupMenu(this);
- popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Remove file","logview"),this,SLOT(deleteCurrent()));
- popup->exec( QCursor::pos() );
-}
-
-void KviLogViewMDIWindow::deleteCurrent()
-{
- KviLogListViewItem* pItem = (KviLogListViewItem *)(m_pListView->currentItem());
- if(pItem)
- {
- if(!pItem->fileName(0).isNull())
- {
- QString szFname;
- g_pApp->getLocalKvircDirectory(szFname,KviApp::Log,pItem->m_pFileData->fileName());
- KviFileUtils::removeFile(szFname);
- delete pItem;
- m_pIrcView->clearBuffer();
- }
- }
-}
-
-KviLogFile::KviLogFile(const QString& name)
-{
- m_szFilename=name;
- QFileInfo fi(m_szFilename);
- m_bCompressed=(fi.extension(false)=="gz");
- QString typeToken = m_szFilename.section('_',0,0);
- // Ignore non-logs files, this includes '.' and '..'
- if( KviQString::equalCI(typeToken,"channel") )
- m_type = Channel;
- else if( KviQString::equalCI(typeToken,"console") )
- m_type = Console;
- else if( KviQString::equalCI(typeToken,"dccchat") )
- m_type = DccChat;
- else if( KviQString::equalCI(typeToken,"query") )
- m_type = Query;
- else
- m_type = Other;
-
- KviStr undecoded = m_szFilename.section('.',0,0);
- undecoded.cutToFirst('_');
- m_szName = undecoded.hexDecode(undecoded.ptr()).ptr();
-
- undecoded = m_szFilename.section('.',1,1).section('_',0,0);
- m_szNetwork = undecoded.hexDecode(undecoded.ptr()).ptr();
-
- QString szDate = m_szFilename.section('.',1,3).section('_',1,1);
- int iYear = szDate.section('.',0,0).toInt();
- int iMonth = szDate.section('.',1,1).toInt();
- int iDay = szDate.section('.',2,2).toInt();
- m_date.setYMD(iYear,iMonth,iDay);
-
- //debug("type=%i, name=%s, net=%s, date=%i %i %i",m_type,m_szName.ascii(),m_szNetwork.ascii(),iYear,iMonth,iDay);
-}
-
-void KviLogFile::getText(QString & text,const QString& logDir){
- QString logName = logDir;
- QFile logFile;
- logName.append(fileName());
-#ifdef COMPILE_ZLIB_SUPPORT
- if(m_bCompressed)
- {
- gzFile file=gzopen(logName.local8Bit().data(),"rb");
- if(file)
- {
- char buff[1025];
- int len;
- KviQCString data;
- //QCString data;
- len=gzread(file,buff,1024);
- while(len>0)
- {
- buff[len]=0;
- data.append(buff);
- len=gzread(file,buff,1024);
- }
- gzclose(file);
- text = QString::fromUtf8(data);
- } else {
- debug("Cannot open compressed file %s",logName.local8Bit().data());
- }
- } else {
-#endif
- logFile.setName(logName);
-
- if(!logFile.open(IO_ReadOnly))
- return;
-
- QByteArray bytes;
- bytes=logFile.readAll();
- text = QString::fromUtf8(bytes.data(), bytes.size());
- logFile.close();
-#ifdef COMPILE_ZLIB_SUPPORT
- }
-#endif
-}
-
-#include "logviewmdiwindow.moc"
+#else + m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter"); +#endif + m_pTabWidget = new QTabWidget(m_pSplitter); + + m_pIndexTab = new KviTalVBox(m_pTabWidget); + m_pTabWidget->insertTab(m_pIndexTab,__tr2qs_ctx("Index","logview")); + m_pListView = new KviTalListView(m_pIndexTab); + m_pListView->addColumn(__tr2qs_ctx("Log File","logview"),135); + m_pListView->setColumnWidthMode(0,KviTalListView::Maximum); + m_pListView->setAllColumnsShowFocus(true); + m_pListView->setMultiSelection(false); + m_pListView->setShowSortIndicator(true); + m_pListView->setRootIsDecorated(true); + connect(m_pListView,SIGNAL(selectionChanged(KviTalListViewItem *)),this,SLOT(itemSelected(KviTalListViewItem *))); + connect(m_pListView,SIGNAL(rightButtonClicked ( KviTalListViewItem * , const QPoint &, int )),this,SLOT(rightButtonClicked ( KviTalListViewItem * , const QPoint &, int ))); + + m_pSearchTab = new QWidget(m_pTabWidget); + m_pTabWidget->insertTab(m_pSearchTab,__tr2qs_ctx("Filter","logview")); + + QGridLayout *layout = new QGridLayout(m_pSearchTab,10,2,3,5); + + m_pShowChannelsCheck = new KviStyledCheckBox(__tr2qs_ctx("Show channel logs","logview"),m_pSearchTab); + m_pShowChannelsCheck->setChecked(true); + layout->addMultiCellWidget(m_pShowChannelsCheck,0,0,0,1); + + m_pShowQueryesCheck = new KviStyledCheckBox(__tr2qs_ctx("Show query logs","logview"),m_pSearchTab); + m_pShowQueryesCheck->setChecked(true); + layout->addMultiCellWidget(m_pShowQueryesCheck,1,1,0,1); + + m_pShowConsolesCheck = new KviStyledCheckBox(__tr2qs_ctx("Show console logs","logview"),m_pSearchTab); + m_pShowConsolesCheck->setChecked(true); + layout->addMultiCellWidget(m_pShowConsolesCheck,2,2,0,1); + + m_pShowDccChatCheck = new KviStyledCheckBox(__tr2qs_ctx("Show DCC chat logs","logview"),m_pSearchTab); + m_pShowDccChatCheck->setChecked(true); + layout->addMultiCellWidget(m_pShowDccChatCheck,3,3,0,1); + + m_pShowOtherCheck = new KviStyledCheckBox(__tr2qs_ctx("Show other logs","logview"),m_pSearchTab); + m_pShowOtherCheck->setChecked(true); + layout->addMultiCellWidget(m_pShowOtherCheck,4,4,0,1); + + QLabel *l; + l = new QLabel(__tr2qs_ctx("Contents filter","logview"),m_pSearchTab); + layout->addMultiCellWidget(l,5,5,0,1); + + l = new QLabel(__tr2qs_ctx("Log name mask:","logview"),m_pSearchTab); + m_pFileNameMask = new QLineEdit(m_pSearchTab); + connect(m_pFileNameMask,SIGNAL(returnPressed()),this,SLOT(applyFilter())); + layout->addWidget(l,6,0); + layout->addWidget(m_pFileNameMask,6,1); + + l = new QLabel(__tr2qs_ctx("Log contents mask:","logview"),m_pSearchTab); + m_pContentsMask = new QLineEdit(m_pSearchTab); + connect(m_pContentsMask,SIGNAL(returnPressed()),this,SLOT(applyFilter())); + layout->addWidget(l,7,0); + layout->addWidget(m_pContentsMask,7,1); + + m_pEnableFromFilter = new KviStyledCheckBox(__tr2qs_ctx("Only older than","logview"),m_pSearchTab); + m_pFromDateEdit = new QDateEdit(m_pSearchTab); + m_pFromDateEdit->setDate(QDate::currentDate()); + layout->addWidget(m_pEnableFromFilter,8,0); + layout->addWidget(m_pFromDateEdit,8,1); + connect(m_pEnableFromFilter,SIGNAL(toggled(bool)),m_pFromDateEdit,SLOT(setEnabled(bool))); + m_pFromDateEdit->setEnabled(false); + + m_pEnableToFilter = new KviStyledCheckBox(__tr2qs_ctx("Only newier than","logview"),m_pSearchTab); + m_pToDateEdit = new QDateEdit(m_pSearchTab); + m_pToDateEdit->setDate(QDate::currentDate()); + layout->addWidget(m_pEnableToFilter,9,0); + layout->addWidget(m_pToDateEdit,9,1); + connect(m_pEnableToFilter,SIGNAL(toggled(bool)),m_pToDateEdit,SLOT(setEnabled(bool))); + m_pToDateEdit->setEnabled(false); + + QPushButton *pb = new QPushButton(__tr2qs_ctx("Apply filter","logview"),m_pSearchTab); + connect(pb,SIGNAL(clicked()),this,SLOT(applyFilter())); + layout->addWidget(pb,10,1); + + QWidget *w = new QWidget(m_pSearchTab); + w->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored); + layout->addWidget(w,11,1); + + m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this); +#ifdef COMPILE_USE_QT4 + m_pIrcView->setFocusPolicy(Qt::ClickFocus); +#else + m_pIrcView->setFocusPolicy(QWidget::ClickFocus); +#endif + KviValueList<int> li; + li.append(110); + li.append(width()-110); + m_pSplitter->setSizes(li); + + g_pApp->getLocalKvircDirectory(m_szLogDirectory,KviApp::Log); + KviQString::ensureLastCharIs(m_szLogDirectory,'/'); // Does this work on Windows? + + cacheFileList(); + setupItemList(); + KviAccel *a = new KviAccel( this ); + a->connectItem( a->insertItem(Qt::Key_F+Qt::CTRL), + m_pIrcView, + SLOT(toggleToolWidget()) ); +} + + + +KviLogViewMDIWindow::~KviLogViewMDIWindow() +{ + g_pLogViewWindow = 0; +} + +void KviLogViewMDIWindow::applyFilter() +{ + setupItemList(); +} + + +QPixmap * KviLogViewMDIWindow::myIconPtr() +{ + return g_pIconManager->getSmallIcon(KVI_SMALLICON_LOG); +} + + +void KviLogViewMDIWindow::resizeEvent(QResizeEvent *e) +{ + m_pSplitter->setGeometry(0,0,width(),height()); +} + +void KviLogViewMDIWindow::fillCaptionBuffers() +{ + m_szPlainTextCaption = __tr2qs_ctx("Log Viewer","logview"); + + m_szHtmlActiveCaption = QString("<nobr><font color=\"%1\"><b>").arg(KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii()); + m_szHtmlActiveCaption.append(m_szPlainTextCaption); + m_szHtmlActiveCaption.append("</b></font></nobr>"); + + m_szHtmlInactiveCaption = QString("<nobr><font color=\"%1\"><b>").arg(KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii()); + m_szHtmlInactiveCaption.append(m_szPlainTextCaption); + m_szHtmlInactiveCaption.append("</b></font></nobr>"); +} + +void KviLogViewMDIWindow::die() +{ + close(); +} + +QSize KviLogViewMDIWindow::sizeHint() const +{ + QSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height()); + return ret; +} + +void KviLogViewMDIWindow::setupItemList() +{ + m_pListView->clear(); + KviLogFile *pFile; + //m_logList.begin(); + KviLogListViewItem *pLastCategory=0; + KviLogListViewItemFolder *pLastGroupItem; + QString szLastGroup; + QString szCurGroup; + const bool bShowChannel=m_pShowChannelsCheck->isChecked(); + const bool bShowQuery=m_pShowQueryesCheck->isChecked(); + const bool bShowConsole=m_pShowConsolesCheck->isChecked(); + const bool bShowOther=m_pShowOtherCheck->isChecked(); + const bool bShowDccChat=m_pShowDccChatCheck->isChecked(); + + const bool filterFromDate=m_pEnableFromFilter->isChecked(); + const bool filterToDate=m_pEnableToFilter->isChecked(); + + const QString nameFilterText = m_pFileNameMask->text(); + const bool enableNameFilter = !nameFilterText.isEmpty(); + + const QString contentFilterText = m_pContentsMask->text(); + const bool enableContentFilter = !contentFilterText.isEmpty(); + + QDate fromDate = m_pFromDateEdit->date(); + QDate toDate = m_pToDateEdit->date(); + + QString textBuffer; +#ifdef COMPILE_USE_QT4 + Q3ProgressDialog progress( __tr2qs_ctx("Filtering files...","logview"), + __tr2qs_ctx("Abort filtering","logview"), m_logList.count(), + this, "progress", TRUE ); +#else + QProgressDialog progress( __tr2qs_ctx("Filtering files...","logview"), + __tr2qs_ctx("Abort filtering","logview"), m_logList.count(), + this, "progress", TRUE ); +#endif + + + int i=0; + for(pFile=m_logList.first();pFile;pFile=m_logList.next()) + { + progress.setProgress( i ); + i++; + g_pApp->processEvents(); + + if ( progress.wasCanceled() ) + break; + + if(pFile->type()==KviLogFile::Channel && !bShowChannel) + continue; + if(pFile->type()==KviLogFile::Console && !bShowConsole) + continue; + if(pFile->type()==KviLogFile::DccChat && !bShowDccChat) + continue; + if(pFile->type()==KviLogFile::Other && !bShowOther) + continue; + if(pFile->type()==KviLogFile::Query && !bShowQuery) + continue; + + if(filterFromDate) + if(pFile->date()<fromDate) + continue; + + if(filterToDate) + if(pFile->date()>toDate) + continue; + + if(enableNameFilter) + if(!KviQString::matchStringCI(nameFilterText,pFile->name())) + continue; + + if(enableContentFilter) + { + pFile->getText(textBuffer,m_szLogDirectory); + if(!KviQString::matchStringCI(contentFilterText,textBuffer)) + continue; + } + + if(pLastCategory) + { + if(pLastCategory->m_type!=pFile->type()) + pLastCategory = new KviLogListViewItemType(m_pListView,pFile->type()); + } else { + pLastCategory = new KviLogListViewItemType(m_pListView,pFile->type()); + } + + KviQString::sprintf(szCurGroup,__tr2qs_ctx("%Q on %Q","logview"),&(pFile->name()), + &(pFile->network()) + ); + + if(szLastGroup!=szCurGroup) { + szLastGroup=szCurGroup; + pLastGroupItem=new KviLogListViewItemFolder(pLastCategory,szLastGroup); + } + new KviLogListViewLog(pLastGroupItem,pFile->type(),pFile); + } + progress.setProgress( m_logList.count() ); +} + +void KviLogViewMDIWindow::cacheFileList() +{ + QStringList m_pFileNames = getFileNames(); + m_pFileNames.sort(); + QString szFname; + + for(QStringList::Iterator it = m_pFileNames.begin(); it != m_pFileNames.end(); ++it) + { + szFname=(*it); + QFileInfo fi(szFname); + if(fi.extension(false)=="gz" || fi.extension(false)=="log") + m_logList.append(new KviLogFile(szFname)); + } +} + +void KviLogViewMDIWindow::itemSelected(KviTalListViewItem * it) +{ + bool bCompressed=0; + //A parent node + m_pIrcView->clearBuffer(); + if(!it || !it->parent() || !(((KviLogListViewItem *)it)->m_pFileData) ) + { + return; + } + + QString text; + ((KviLogListViewItem *)it)->m_pFileData->getText(text,m_szLogDirectory); + + QStringList lines=QStringList::split('\n',text); + bool bOk; + int iMsgType; + for ( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) { + QString num=(*it).section(' ',0,0); + iMsgType=num.toInt(&bOk); + if(bOk) + outputNoFmt(iMsgType,(*it).section(' ',1),KviIrcView::NoRepaint | KviIrcView::NoTimestamp); + else + outputNoFmt(0,*it,KviIrcView::NoRepaint | KviIrcView::NoTimestamp); + } + m_pIrcView->repaint(false); +} + +QStringList KviLogViewMDIWindow::getFileNames() +{ + QString logPath; + g_pApp->getLocalKvircDirectory(logPath,KviApp::Log); + QString qPath(logPath); + QDir logDir(qPath); + return logDir.entryList(); +} + +void KviLogViewMDIWindow::rightButtonClicked ( KviTalListViewItem * it, const QPoint &, int ) +{ + if(!it) return; + if(((KviLogListViewItem *)it)->fileName(0).isEmpty()) return; + KviTalPopupMenu* popup = new KviTalPopupMenu(this); + popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Remove file","logview"),this,SLOT(deleteCurrent())); + popup->exec( QCursor::pos() ); +} + +void KviLogViewMDIWindow::deleteCurrent() +{ + KviLogListViewItem* pItem = (KviLogListViewItem *)(m_pListView->currentItem()); + if(pItem) + { + if(!pItem->fileName(0).isNull()) + { + QString szFname; + g_pApp->getLocalKvircDirectory(szFname,KviApp::Log,pItem->m_pFileData->fileName()); + KviFileUtils::removeFile(szFname); + delete pItem; + m_pIrcView->clearBuffer(); + } + } +} + +KviLogFile::KviLogFile(const QString& name) +{ + m_szFilename=name; + QFileInfo fi(m_szFilename); + m_bCompressed=(fi.extension(false)=="gz"); + QString typeToken = m_szFilename.section('_',0,0); + // Ignore non-logs files, this includes '.' and '..' + if( KviQString::equalCI(typeToken,"channel") ) + m_type = Channel; + else if( KviQString::equalCI(typeToken,"console") ) + m_type = Console; + else if( KviQString::equalCI(typeToken,"dccchat") ) + m_type = DccChat; + else if( KviQString::equalCI(typeToken,"query") ) + m_type = Query; + else + m_type = Other; + + KviStr undecoded = m_szFilename.section('.',0,0); + undecoded.cutToFirst('_'); + m_szName = undecoded.hexDecode(undecoded.ptr()).ptr(); + + undecoded = m_szFilename.section('.',1,1).section('_',0,0); + m_szNetwork = undecoded.hexDecode(undecoded.ptr()).ptr(); + + QString szDate = m_szFilename.section('.',1,3).section('_',1,1); + int iYear = szDate.section('.',0,0).toInt(); + int iMonth = szDate.section('.',1,1).toInt(); + int iDay = szDate.section('.',2,2).toInt(); + m_date.setYMD(iYear,iMonth,iDay); + + //debug("type=%i, name=%s, net=%s, date=%i %i %i",m_type,m_szName.ascii(),m_szNetwork.ascii(),iYear,iMonth,iDay); +} + +void KviLogFile::getText(QString & text,const QString& logDir){ + QString logName = logDir; + QFile logFile; + logName.append(fileName()); +#ifdef COMPILE_ZLIB_SUPPORT + if(m_bCompressed) + { + gzFile file=gzopen(logName.local8Bit().data(),"rb"); + if(file) + { + char buff[1025]; + int len; + KviQCString data; + //QCString data; + len=gzread(file,buff,1024); + while(len>0) + { + buff[len]=0; + data.append(buff); + len=gzread(file,buff,1024); + } + gzclose(file); + text = QString::fromUtf8(data); + } else { + debug("Cannot open compressed file %s",logName.local8Bit().data()); + } + } else { +#endif + logFile.setName(logName); + + if(!logFile.open(IO_ReadOnly)) + return; + + QByteArray bytes; + bytes=logFile.readAll(); + text = QString::fromUtf8(bytes.data(), bytes.size()); + logFile.close(); +#ifdef COMPILE_ZLIB_SUPPORT + } +#endif +} + +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES +#include "logviewmdiwindow.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp index 29398b8f1..f4218ac14 100644 --- a/src/modules/logview/logviewwidget.cpp +++ b/src/modules/logview/logviewwidget.cpp @@ -73,4 +73,7 @@ QString KviLogListViewItemType::text(int col) const }; +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "logviewwidget.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp index 800a3e15d..53a325edd 100644 --- a/src/modules/mediaplayer/libkvimediaplayer.cpp +++ b/src/modules/mediaplayer/libkvimediaplayer.cpp @@ -1604,7 +1604,7 @@ static bool mediaplayer_module_init( KviModule * m ) g_pDescriptorList = new KviPointerList<KviMediaPlayerInterfaceDescriptor>; g_pDescriptorList->setAutoDelete(true); -#ifndef COMPILE_ON_WINDOWS +#if (!defined(COMPILE_ON_WINDOWS) && !defined(Q_OS_MACX)) g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviXmmsInterface)); g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAudaciousClassicInterface)); g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAudaciousInterface)); diff --git a/src/modules/mediaplayer/mp_audaciousinterface.cpp b/src/modules/mediaplayer/mp_audaciousinterface.cpp index 8d40dc04e..835a92348 100644 --- a/src/modules/mediaplayer/mp_audaciousinterface.cpp +++ b/src/modules/mediaplayer/mp_audaciousinterface.cpp @@ -23,8 +23,7 @@ //============================================================================= #include "mp_audaciousinterface.h" - -#ifndef COMPILE_ON_WINDOWS +#if (!defined(COMPILE_ON_WINDOWS) && !defined(Q_OS_MACX)) #include "kvi_locale.h" MP_IMPLEMENT_DESCRIPTOR( diff --git a/src/modules/mediaplayer/mp_audaciousinterface.h b/src/modules/mediaplayer/mp_audaciousinterface.h index cf8fdd075..66b51817d 100644 --- a/src/modules/mediaplayer/mp_audaciousinterface.h +++ b/src/modules/mediaplayer/mp_audaciousinterface.h @@ -27,7 +27,7 @@ #include "kvi_settings.h" #include "mp_interface.h" -#ifndef COMPILE_ON_WINDOWS +#if (!defined(COMPILE_ON_WINDOWS) && !defined(Q_OS_MACX)) #include <QtDBus/QtDBus> class KviAudaciousInterface : public KviMediaPlayerInterface diff --git a/src/modules/mediaplayer/mp_xmmsinterface.cpp b/src/modules/mediaplayer/mp_xmmsinterface.cpp index 3e2f61fd1..caf10c35d 100644 --- a/src/modules/mediaplayer/mp_xmmsinterface.cpp +++ b/src/modules/mediaplayer/mp_xmmsinterface.cpp @@ -27,7 +27,7 @@ #include "mp_xmmsinterface.h" -#ifndef COMPILE_ON_WINDOWS +#if (!defined(COMPILE_ON_WINDOWS) && !defined(Q_OS_MACX)) #include "kvi_locale.h" diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index 96cc131e8..49eb78abd 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -382,4 +382,7 @@ KVIRC_MODULE( mircimport_module_cleanup ) +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "libkvimircimport.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/my/idle.cpp b/src/modules/my/idle.cpp index 34eef595d..75c576170 100644 --- a/src/modules/my/idle.cpp +++ b/src/modules/my/idle.cpp @@ -130,4 +130,7 @@ void Idle::doCheck() secondsIdle(secondsIdle()); } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "idle.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp index 9caa25ca2..52b4c0a85 100644 --- a/src/modules/my/libkvimy.cpp +++ b/src/modules/my/libkvimy.cpp @@ -32,7 +32,6 @@ #include "kvi_ircserver.h" #include "idle.h" Idle* g_pIdle; -#ifdef COMPILE_NEW_KVS #define GET_KVS_CONSOLE \ kvs_uint_t uiWnd; \ KviConsole *wnd =0; \ @@ -49,7 +48,6 @@ Idle* g_pIdle; wnd = g_pApp->findConsole(uiWnd); \ if(!wnd)c->warning(__tr2qs("No such irc context (%d)"),uiWnd); \ } -#endif /* @doc: my.nick @type: diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index e49627c3d..8dfa15bc1 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -163,4 +163,7 @@ void KviKvsObject_button::slotClicked() } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_button.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp index 1e9260509..73e71b01a 100644 --- a/src/modules/objects/class_checkbox.cpp +++ b/src/modules/objects/class_checkbox.cpp @@ -125,4 +125,7 @@ void KviKvsObject_checkbox::toggled(bool b) } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_checkbox.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index fa9341b85..172d3b9b9 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -365,4 +365,7 @@ void KviKvsObject_combobox::slotActivated(int i) } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_combobox.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp index 762b217ad..abd43a51a 100644 --- a/src/modules/objects/class_dockwindow.cpp +++ b/src/modules/objects/class_dockwindow.cpp @@ -228,4 +228,7 @@ bool KviKvsObject_dockwindow::function_dock(KviKvsObjectFunctionCall * c) return true; } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_dockwindow.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp index 87ef39b74..5ce5e750c 100644 --- a/src/modules/objects/class_file.cpp +++ b/src/modules/objects/class_file.cpp @@ -448,4 +448,8 @@ bool KviScriptFileObject::functionHexRead(KviCommand * c, KviParameterList * p, } */ + +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_file.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp index a5e94ebc7..d00357c49 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -458,4 +458,7 @@ void KviKvsObject_lineedit::slottextChanged(const QString &text) } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_lineedit.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp index bf7292773..bfcba51ca 100644 --- a/src/modules/objects/class_listbox.cpp +++ b/src/modules/objects/class_listbox.cpp @@ -387,4 +387,7 @@ kvs_uint_t uIndex; } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_listbox.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp index 2d2d25ed2..8e7d42172 100644 --- a/src/modules/objects/class_listview.cpp +++ b/src/modules/objects/class_listview.cpp @@ -555,4 +555,7 @@ void KviKvsMdmListView::contentsDropEvent(QDropEvent *e) } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_listview.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp index 7d193b98f..bfac0ef61 100644 --- a/src/modules/objects/class_listviewitem.cpp +++ b/src/modules/objects/class_listviewitem.cpp @@ -418,4 +418,7 @@ bool KviKvsObject_listviewitem::function_setPixmap(KviKvsObjectFunctionCall *c) return true; } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_listviewitem.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index 2e4437e86..2e45ef780 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -1196,4 +1196,7 @@ bool KviKvsObject_mledit::functionselectAll(KviKvsObjectFunctionCall *c) +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_multilineedit.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index 4f8ff069e..97d0a2282 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -1596,4 +1596,7 @@ bool KviKvsObject_painter::functionresetPath(KviKvsObjectFunctionCall *c) +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
#include "m_class_painter.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
+
diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp index 1a73a2db3..3b95e662f 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -302,4 +302,7 @@ QImage * KviKvsObject_pixmap::getImage() return m_pImage; } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_pixmap.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index c32d0f891..090952e98 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -358,4 +358,7 @@ bool KviKvsObject_popupmenu::functionactivatedEvent(KviKvsObjectFunctionCall *c) } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_popupmenu.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp index f0be51875..0de09750c 100644 --- a/src/modules/objects/class_process.cpp +++ b/src/modules/objects/class_process.cpp @@ -307,4 +307,7 @@ void KviKvsObject_process::slotReadStderr() callFunction(this,"readyReadStderrEvent",params); } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_process.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index 402d24b50..e70605fa6 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -135,4 +135,7 @@ void KviKvsObject_radiobutton::toggled(bool b) } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_radiobutton.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp index 54673d610..c4a235241 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -284,4 +284,7 @@ void KviKvsObject_slider::valueChanged(int value) } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_slider.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index c10c89e1e..48ebddbd9 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -1328,4 +1328,7 @@ KviQCString szData8 = szData.utf8(); //-------------- +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_socket.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp index a4e34494b..406ba9877 100644 --- a/src/modules/objects/class_spinbox.cpp +++ b/src/modules/objects/class_spinbox.cpp @@ -258,4 +258,7 @@ void KviKvsObject_spinbox::valueChanged(int value) callFunction(this,"valueChangedEvent",¶ms); } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_spinbox.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index 7e0df3a74..9213d497a 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -526,4 +526,7 @@ void KviKvsObject_tabwidget::slotCurrentChanged(int value) callFunction(this,"currentChangedEvent",¶ms); } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_tabwidget.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp index bd46f0803..4010edc99 100644 --- a/src/modules/objects/class_tbrowser.cpp +++ b/src/modules/objects/class_tbrowser.cpp @@ -140,4 +140,7 @@ bool KviKvsObject_textbrowser::function_linkClickedEvent(KviKvsObjectFunctionCal return true; } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_tbrowser.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp index 72ff1513f..33288882f 100644 --- a/src/modules/objects/class_toolbar.cpp +++ b/src/modules/objects/class_toolbar.cpp @@ -153,5 +153,8 @@ bool KviKvsObject_toolbar::functionclear(KviKvsObjectFunctionCall *c) return true; } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_toolbar.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index b2d3e651b..0da72ad07 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -327,5 +327,8 @@ void KviKvsObject_toolbutton::slotClicked() callFunction(this,"clickEvent",params); } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_toolbutton.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index 0a90181ec..e08fe3a9a 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -1907,4 +1907,7 @@ bool KviKvsObject_widget::function_setKeyShortcut(KviKvsObjectFunctionCall *c) return true;
}
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
#include "m_class_widget.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
+
diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp index 46e6d37bf..7a3f584d4 100644 --- a/src/modules/objects/class_window.cpp +++ b/src/modules/objects/class_window.cpp @@ -151,4 +151,8 @@ bool KviKvsObject_window::functionsetCentralWidget(KviKvsObjectFunctionCall *c) ((KviKvsScriptWindowWindow *)widget())->setCentralWidget((KviKvsObject_widget *)ob,((KviKvsObject_widget *)ob)->widget()); return true; } + +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_window.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp index ca3302f3f..b441dc2a7 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -368,4 +368,8 @@ void KviKvsMdmWizard::slotBackClicked() KviKvsMdmWizard::~KviKvsMdmWizard() { } + +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_wizard.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index 1eddbe73d..23debfb7f 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -216,4 +216,7 @@ QWidget *KviKvsObject_wrapper::findWidgetToWrap(const char *szClass, const char return 0; } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_wrapper.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp index 927dcd80a..cb7781409 100644 --- a/src/modules/objects/class_xmlreader.cpp +++ b/src/modules/objects/class_xmlreader.cpp @@ -340,4 +340,7 @@ bool KviKvsObject_xmlreader::function_lastError(KviKvsObjectFunctionCall *c) return true; } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_class_xmlreader.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp index ed6e21b16..b3684fff0 100644 --- a/src/modules/reguser/edituser.cpp +++ b/src/modules/reguser/edituser.cpp @@ -778,4 +778,7 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked() +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
#include "edituser.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
+
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp index 8661921df..a14ed1b2d 100644 --- a/src/modules/reguser/wizard.cpp +++ b/src/modules/reguser/wizard.cpp @@ -461,4 +461,7 @@ void KviRegistrationWizard::notifyCheckToggled(bool) notifyNickChanged(dummy); } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "wizard.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp index 60d9bb67f..5faa74471 100644 --- a/src/modules/rijndael/libkvirijndael.cpp +++ b/src/modules/rijndael/libkvirijndael.cpp @@ -849,5 +849,7 @@ KVIRC_MODULE( ) #ifdef COMPILE_CRYPT_SUPPORT - #include "libkvirijndael.moc" + #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES + #include "libkvirijndael.moc" + #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES #endif diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 5b84eb85c..7a7bb87c6 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -1128,4 +1128,7 @@ void KviSetupWizard::accept() KviTalWizard::accept(); } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "setupwizard.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index bab3490f3..6931397ce 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -739,4 +739,7 @@ void KviSharedFilesWindow::die() //} +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_sharedfileswindow.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index c33c85665..c12d4e28a 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -741,4 +741,7 @@ KVIRC_MODULE( snd_module_cleanup ) +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "libkvisnd.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp index 3af4e5b4f..75693bba2 100644 --- a/src/modules/socketspy/socketspywindow.cpp +++ b/src/modules/socketspy/socketspywindow.cpp @@ -122,4 +122,8 @@ void KviSocketSpyWindow::applyOptions() m_pIrcView->applyOptions(); KviWindow::applyOptions(); } + +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "m_socketspywindow.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/spaste/controller.cpp b/src/modules/spaste/controller.cpp index 23f4e732a..cf6924275 100644 --- a/src/modules/spaste/controller.cpp +++ b/src/modules/spaste/controller.cpp @@ -118,4 +118,7 @@ void SPasteController::pasteClipboard(void) } else delete this;//Clipboard finished } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "controller.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp index f4aa8d6ee..7450dec35 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -306,4 +306,7 @@ KVIRC_MODULE( tip_module_cleanup ) +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "libkvitip.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index 756ccfd09..68714f9cf 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -680,4 +680,7 @@ KVIRC_MODULE( dockwidget_module_cleanup ) +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "libkvitrayicon.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index ecdb9e6ec..9003ed49f 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -907,4 +907,7 @@ KVIRC_MODULE( url_module_cleanup ) +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "libkviurl.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES + |