From 6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 17:25:43 -0600 Subject: Fix FTBFS --- kmail/klistboxdialog.cpp | 83 ----------------------------- kmail/klistboxdialog.h | 37 ------------- kmail/klistviewindexedsearchline.cpp | 74 ------------------------- kmail/klistviewindexedsearchline.h | 77 -------------------------- kmail/pics/attachmentQuicklistClosed.png | Bin 727 -> 0 bytes kmail/pics/attachmentQuicklistOpened.png | Bin 719 -> 0 bytes kmail/pics/attachmentQuictdelistClosed.png | Bin 0 -> 727 bytes kmail/pics/attachmentQuictdelistOpened.png | Bin 0 -> 719 bytes kmail/tdelistboxdialog.cpp | 83 +++++++++++++++++++++++++++++ kmail/tdelistboxdialog.h | 37 +++++++++++++ kmail/tdelistviewindexedsearchline.cpp | 74 +++++++++++++++++++++++++ kmail/tdelistviewindexedsearchline.h | 77 ++++++++++++++++++++++++++ 12 files changed, 271 insertions(+), 271 deletions(-) delete mode 100644 kmail/klistboxdialog.cpp delete mode 100644 kmail/klistboxdialog.h delete mode 100644 kmail/klistviewindexedsearchline.cpp delete mode 100644 kmail/klistviewindexedsearchline.h delete mode 100644 kmail/pics/attachmentQuicklistClosed.png delete mode 100644 kmail/pics/attachmentQuicklistOpened.png create mode 100644 kmail/pics/attachmentQuictdelistClosed.png create mode 100644 kmail/pics/attachmentQuictdelistOpened.png create mode 100644 kmail/tdelistboxdialog.cpp create mode 100644 kmail/tdelistboxdialog.h create mode 100644 kmail/tdelistviewindexedsearchline.cpp create mode 100644 kmail/tdelistviewindexedsearchline.h (limited to 'kmail') diff --git a/kmail/klistboxdialog.cpp b/kmail/klistboxdialog.cpp deleted file mode 100644 index eaa627bb..00000000 --- a/kmail/klistboxdialog.cpp +++ /dev/null @@ -1,83 +0,0 @@ -// This must be first -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "klistboxdialog.h" - -#include -#include - -TDEListBoxDialog::TDEListBoxDialog( TQString& _selectedString, - const TQString& caption, - const TQString& labelText, - TQWidget* parent, - const char* name, - bool modal ) - : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok, true ), - selectedString( _selectedString ) - -{ - if ( !name ) - setName( "TDEListBoxDialog" ); - resize( 400, 180 ); - - TQFrame *page = makeMainWidget(); - TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); - labelAboveLA = new TQLabel( page, "labelAboveLA" ); - labelAboveLA->setText( labelText ); - - topLayout->addWidget( labelAboveLA ); - - entriesLB = new TQListBox( page, "entriesLB" ); - - topLayout->addWidget( entriesLB ); - - commentBelowLA = new TQLabel( page, "commentBelowLA" ); - commentBelowLA->setText( "" ); - topLayout->addWidget( commentBelowLA ); - commentBelowLA->hide(); - - // signals and slots connections - connect( entriesLB, TQT_SIGNAL( highlighted( const TQString& ) ), - this, TQT_SLOT( highlighted( const TQString& ) ) ); - connect( entriesLB, TQT_SIGNAL( selected(int) ), - TQT_SLOT( slotOk() ) ); - // buddies - labelAboveLA->setBuddy( entriesLB ); -} - -/* - * Destroys the object and frees any allocated resources - */ -TDEListBoxDialog::~TDEListBoxDialog() -{ - // no need to delete child widgets, TQt does it all for us -} - -void TDEListBoxDialog::setLabelAbove(const TQString& label) -{ - labelAboveLA->setText( label ); - if( label.isEmpty() ) - labelAboveLA->hide(); - else - labelAboveLA->show(); -} - -void TDEListBoxDialog::setCommentBelow(const TQString& comment) -{ - commentBelowLA->setText( comment ); - if( comment.isEmpty() ) - commentBelowLA->hide(); - else - commentBelowLA->show(); -} - - - -void TDEListBoxDialog::highlighted( const TQString& txt ) -{ - selectedString = txt; -} - -#include "klistboxdialog.moc" diff --git a/kmail/klistboxdialog.h b/kmail/klistboxdialog.h deleted file mode 100644 index 30a67286..00000000 --- a/kmail/klistboxdialog.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef KLISTBOXDIALOG_H -#define KLISTBOXDIALOG_H - -#include - -class TQLabel; -class TQListBox; - -class TDEListBoxDialog : public KDialogBase -{ - Q_OBJECT - - -public: - TDEListBoxDialog( TQString& _selectedString, - const TQString& caption, - const TQString& labelText, - TQWidget* parent = 0, - const char* name = 0, - bool modal = true ); - ~TDEListBoxDialog(); - - void setLabelAbove( const TQString& label ); - void setCommentBelow(const TQString& comment); - - TQListBox* entriesLB; - -private slots: - void highlighted( const TQString& ); - -protected: - TQString& selectedString; - TQLabel* labelAboveLA; - TQLabel* commentBelowLA; -}; - -#endif diff --git a/kmail/klistviewindexedsearchline.cpp b/kmail/klistviewindexedsearchline.cpp deleted file mode 100644 index b8895ff0..00000000 --- a/kmail/klistviewindexedsearchline.cpp +++ /dev/null @@ -1,74 +0,0 @@ - -/* This file is part of KMail - * Copyright (C) 2005 Luís Pedro Coelho - * - * KMail is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation. - * - * KMail 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * In addition, as a special exception, the copyright holders give - * permission to link the code of this program with any edition of - * the TQt library by Trolltech AS, Norway (or with modified versions - * of TQt that use the same license as TQt), and distribute linked - * combinations including the two. You must obey the GNU General - * Public License in all respects for all of the code used other than - * TQt. If you modify this file, you may extend this exception to - * your version of the file, but you are not obligated to do so. If - * you do not wish to do so, delete this exception statement from - * your version. - */ - -#include "klistviewindexedsearchline.h" -#include -#include -#include -#include "headeritem.h" -#include "kmheaders.h" -#include "kmfolder.h" -#include "index.h" - -using KMail::HeaderListQuickSearch; - -TDEListViewIndexedSearchLine::TDEListViewIndexedSearchLine( TQWidget* parent, TDEListView* listView, TDEActionCollection* actionCollection, const char* name ): - HeaderListQuickSearch( parent, listView, actionCollection, name ), - mFiltering( false ) -{ -} - -TDEListViewIndexedSearchLine::~TDEListViewIndexedSearchLine() { -} - - -void TDEListViewIndexedSearchLine::updateSearch( const TQString& s ) { - kdDebug( 5006 ) << "updateSearch( -" << s << "- )" << endl; - mFiltering = false; - if ( !s.isNull() && !s.isEmpty() ) { - bool ok = false; - KMMsgIndex* index = kmkernel->msgIndex(); - if ( index ) { - mResults = index->simpleSearch( s, &ok ); - std::sort( mResults.begin(), mResults.end() ); - mFiltering = ok; - } - } - TDEListViewSearchLine::updateSearch( s ); -} - -bool TDEListViewIndexedSearchLine::itemMatches( const TQListViewItem* item, const TQString& s ) const { - if ( mFiltering && - std::binary_search( mResults.begin(), mResults.end(), static_cast( item )->msgSerNum() ) ) - return true; - return KMail::HeaderListQuickSearch::itemMatches( item, s ); -} - -#include "klistviewindexedsearchline.moc" - diff --git a/kmail/klistviewindexedsearchline.h b/kmail/klistviewindexedsearchline.h deleted file mode 100644 index abd6e817..00000000 --- a/kmail/klistviewindexedsearchline.h +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ -#define LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ - -/* This file is part of KMail - * Copyright (C) 2005 Luís Pedro Coelho - * - * KMail is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation. - * - * KMail 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * In addition, as a special exception, the copyright holders give - * permission to link the code of this program with any edition of - * the TQt library by Trolltech AS, Norway (or with modified versions - * of TQt that use the same license as TQt), and distribute linked - * combinations including the two. You must obey the GNU General - * Public License in all respects for all of the code used other than - * TQt. If you modify this file, you may extend this exception to - * your version of the file, but you are not obligated to do so. If - * you do not wish to do so, delete this exception statement from - * your version. - */ - - -#include -#include -#include "headerlistquicksearch.h" -#include - -#include - -class TDEListView; -class TQListViewItem; -class TQToolButton; -class TDEListViewSearchLine; - -/** - * Extends HeaderListQuickSearch to also search inside message bodies using KMMsgIndex - */ - -class TDEUI_EXPORT TDEListViewIndexedSearchLine: public KMail::HeaderListQuickSearch -{ - Q_OBJECT - - -public: - - explicit TDEListViewIndexedSearchLine(TQWidget *parent, TDEListView *listView, TDEActionCollection* action, const char *name = 0); - ~TDEListViewIndexedSearchLine(); - -public slots: - /** - * Updates search to only make visible the items that match \a s. If - * \a s is null then the line edit's text will be used. - */ - virtual void updateSearch(const TQString &s = TQString()); - -protected: - virtual bool itemMatches(const TQListViewItem *item, const TQString &s) const; - -private: - std::vector mResults; - bool mFiltering; - -}; - - - -#endif /* LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ */ diff --git a/kmail/pics/attachmentQuicklistClosed.png b/kmail/pics/attachmentQuicklistClosed.png deleted file mode 100644 index b3599ba3..00000000 Binary files a/kmail/pics/attachmentQuicklistClosed.png and /dev/null differ diff --git a/kmail/pics/attachmentQuicklistOpened.png b/kmail/pics/attachmentQuicklistOpened.png deleted file mode 100644 index aaf56156..00000000 Binary files a/kmail/pics/attachmentQuicklistOpened.png and /dev/null differ diff --git a/kmail/pics/attachmentQuictdelistClosed.png b/kmail/pics/attachmentQuictdelistClosed.png new file mode 100644 index 00000000..b3599ba3 Binary files /dev/null and b/kmail/pics/attachmentQuictdelistClosed.png differ diff --git a/kmail/pics/attachmentQuictdelistOpened.png b/kmail/pics/attachmentQuictdelistOpened.png new file mode 100644 index 00000000..aaf56156 Binary files /dev/null and b/kmail/pics/attachmentQuictdelistOpened.png differ diff --git a/kmail/tdelistboxdialog.cpp b/kmail/tdelistboxdialog.cpp new file mode 100644 index 00000000..eaa627bb --- /dev/null +++ b/kmail/tdelistboxdialog.cpp @@ -0,0 +1,83 @@ +// This must be first +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "klistboxdialog.h" + +#include +#include + +TDEListBoxDialog::TDEListBoxDialog( TQString& _selectedString, + const TQString& caption, + const TQString& labelText, + TQWidget* parent, + const char* name, + bool modal ) + : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok, true ), + selectedString( _selectedString ) + +{ + if ( !name ) + setName( "TDEListBoxDialog" ); + resize( 400, 180 ); + + TQFrame *page = makeMainWidget(); + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); + labelAboveLA = new TQLabel( page, "labelAboveLA" ); + labelAboveLA->setText( labelText ); + + topLayout->addWidget( labelAboveLA ); + + entriesLB = new TQListBox( page, "entriesLB" ); + + topLayout->addWidget( entriesLB ); + + commentBelowLA = new TQLabel( page, "commentBelowLA" ); + commentBelowLA->setText( "" ); + topLayout->addWidget( commentBelowLA ); + commentBelowLA->hide(); + + // signals and slots connections + connect( entriesLB, TQT_SIGNAL( highlighted( const TQString& ) ), + this, TQT_SLOT( highlighted( const TQString& ) ) ); + connect( entriesLB, TQT_SIGNAL( selected(int) ), + TQT_SLOT( slotOk() ) ); + // buddies + labelAboveLA->setBuddy( entriesLB ); +} + +/* + * Destroys the object and frees any allocated resources + */ +TDEListBoxDialog::~TDEListBoxDialog() +{ + // no need to delete child widgets, TQt does it all for us +} + +void TDEListBoxDialog::setLabelAbove(const TQString& label) +{ + labelAboveLA->setText( label ); + if( label.isEmpty() ) + labelAboveLA->hide(); + else + labelAboveLA->show(); +} + +void TDEListBoxDialog::setCommentBelow(const TQString& comment) +{ + commentBelowLA->setText( comment ); + if( comment.isEmpty() ) + commentBelowLA->hide(); + else + commentBelowLA->show(); +} + + + +void TDEListBoxDialog::highlighted( const TQString& txt ) +{ + selectedString = txt; +} + +#include "klistboxdialog.moc" diff --git a/kmail/tdelistboxdialog.h b/kmail/tdelistboxdialog.h new file mode 100644 index 00000000..30a67286 --- /dev/null +++ b/kmail/tdelistboxdialog.h @@ -0,0 +1,37 @@ +#ifndef KLISTBOXDIALOG_H +#define KLISTBOXDIALOG_H + +#include + +class TQLabel; +class TQListBox; + +class TDEListBoxDialog : public KDialogBase +{ + Q_OBJECT + + +public: + TDEListBoxDialog( TQString& _selectedString, + const TQString& caption, + const TQString& labelText, + TQWidget* parent = 0, + const char* name = 0, + bool modal = true ); + ~TDEListBoxDialog(); + + void setLabelAbove( const TQString& label ); + void setCommentBelow(const TQString& comment); + + TQListBox* entriesLB; + +private slots: + void highlighted( const TQString& ); + +protected: + TQString& selectedString; + TQLabel* labelAboveLA; + TQLabel* commentBelowLA; +}; + +#endif diff --git a/kmail/tdelistviewindexedsearchline.cpp b/kmail/tdelistviewindexedsearchline.cpp new file mode 100644 index 00000000..b8895ff0 --- /dev/null +++ b/kmail/tdelistviewindexedsearchline.cpp @@ -0,0 +1,74 @@ + +/* This file is part of KMail + * Copyright (C) 2005 Luís Pedro Coelho + * + * KMail is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation. + * + * KMail 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * In addition, as a special exception, the copyright holders give + * permission to link the code of this program with any edition of + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked + * combinations including the two. You must obey the GNU General + * Public License in all respects for all of the code used other than + * TQt. If you modify this file, you may extend this exception to + * your version of the file, but you are not obligated to do so. If + * you do not wish to do so, delete this exception statement from + * your version. + */ + +#include "klistviewindexedsearchline.h" +#include +#include +#include +#include "headeritem.h" +#include "kmheaders.h" +#include "kmfolder.h" +#include "index.h" + +using KMail::HeaderListQuickSearch; + +TDEListViewIndexedSearchLine::TDEListViewIndexedSearchLine( TQWidget* parent, TDEListView* listView, TDEActionCollection* actionCollection, const char* name ): + HeaderListQuickSearch( parent, listView, actionCollection, name ), + mFiltering( false ) +{ +} + +TDEListViewIndexedSearchLine::~TDEListViewIndexedSearchLine() { +} + + +void TDEListViewIndexedSearchLine::updateSearch( const TQString& s ) { + kdDebug( 5006 ) << "updateSearch( -" << s << "- )" << endl; + mFiltering = false; + if ( !s.isNull() && !s.isEmpty() ) { + bool ok = false; + KMMsgIndex* index = kmkernel->msgIndex(); + if ( index ) { + mResults = index->simpleSearch( s, &ok ); + std::sort( mResults.begin(), mResults.end() ); + mFiltering = ok; + } + } + TDEListViewSearchLine::updateSearch( s ); +} + +bool TDEListViewIndexedSearchLine::itemMatches( const TQListViewItem* item, const TQString& s ) const { + if ( mFiltering && + std::binary_search( mResults.begin(), mResults.end(), static_cast( item )->msgSerNum() ) ) + return true; + return KMail::HeaderListQuickSearch::itemMatches( item, s ); +} + +#include "klistviewindexedsearchline.moc" + diff --git a/kmail/tdelistviewindexedsearchline.h b/kmail/tdelistviewindexedsearchline.h new file mode 100644 index 00000000..abd6e817 --- /dev/null +++ b/kmail/tdelistviewindexedsearchline.h @@ -0,0 +1,77 @@ +#ifndef LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ +#define LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ + +/* This file is part of KMail + * Copyright (C) 2005 Luís Pedro Coelho + * + * KMail is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation. + * + * KMail 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * In addition, as a special exception, the copyright holders give + * permission to link the code of this program with any edition of + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked + * combinations including the two. You must obey the GNU General + * Public License in all respects for all of the code used other than + * TQt. If you modify this file, you may extend this exception to + * your version of the file, but you are not obligated to do so. If + * you do not wish to do so, delete this exception statement from + * your version. + */ + + +#include +#include +#include "headerlistquicksearch.h" +#include + +#include + +class TDEListView; +class TQListViewItem; +class TQToolButton; +class TDEListViewSearchLine; + +/** + * Extends HeaderListQuickSearch to also search inside message bodies using KMMsgIndex + */ + +class TDEUI_EXPORT TDEListViewIndexedSearchLine: public KMail::HeaderListQuickSearch +{ + Q_OBJECT + + +public: + + explicit TDEListViewIndexedSearchLine(TQWidget *parent, TDEListView *listView, TDEActionCollection* action, const char *name = 0); + ~TDEListViewIndexedSearchLine(); + +public slots: + /** + * Updates search to only make visible the items that match \a s. If + * \a s is null then the line edit's text will be used. + */ + virtual void updateSearch(const TQString &s = TQString()); + +protected: + virtual bool itemMatches(const TQListViewItem *item, const TQString &s) const; + +private: + std::vector mResults; + bool mFiltering; + +}; + + + +#endif /* LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ */ -- cgit v1.2.3