@@ -104,4 +104,3 @@ int BasketUniqueAppHandler::newInstance() return 0; } -#include "basket_plugin.moc" kontact_plugin/basket_plugin.cpp @@ -168,4 +168,3 @@ void UniqueAppWatcher::unregisteredFromDCOP( const QCString& appId ) } } -#include "uniqueapphandler.moc" kontact_plugin/uniqueapphandler.cpp @@ -392,4 +392,3 @@ void BackgroundManager::doGarbage() } } -#include "backgroundmanager.moc" src/backgroundmanager.cpp @@ -425,4 +425,3 @@ void RestoreThread::run() } } -#include "backup.moc" src/backup.cpp @@ -99,4 +99,3 @@ void BasketPart::setCaption(const QString &caption) emit setWindowCaption(caption); } -#include "basket_part.moc" src/basket_part.cpp @@ -814,4 +814,3 @@ void BasketTreeListView::focusInEvent(QFocusEvent*) basket->setFocus(); } -#include "basketlistview.moc" src/basketlistview.cpp @@ -202,4 +202,3 @@ void BasketPropertiesDialog::selectColumnsLayout() m_disposition->setButton(0); } -#include "basketproperties.moc" src/basketproperties.cpp @@ -187,4 +187,3 @@ bool BasketStatusBar::eventFilter(QObject * obj, QEvent * event) { return QObject::eventFilter(obj, event); // standard event processing } -#include "basketstatusbar.moc" src/basketstatusbar.cpp @@ -96,4 +96,3 @@ void DesktopColorPicker::keyPressEvent(QKeyEvent *event) QDesktopWidget::keyPressEvent(event); } -#include "colorpicker.moc" src/colorpicker.cpp @@ -73,4 +73,3 @@ void DebugWindow::closeEvent(QCloseEvent *event) QWidget::closeEvent(event); } -#include "debugwindow.moc" src/debugwindow.cpp @@ -155,4 +155,3 @@ bool ExporterDialog::formatForImpression() return m_formatForImpression->isChecked(); } -#include "exporterdialog.moc" src/exporterdialog.cpp @@ -315,4 +315,3 @@ void FilterBar::tagChanged(int index) emit newFilter(*m_data); } -#include "filter.moc" src/filter.cpp @@ -308,4 +308,3 @@ QDomElement FormatImporter::importBasket(const QString &folderName) return properties; } -#include "formatimporter.moc" src/formatimporter.cpp @@ -773,5 +773,4 @@ void KColorCombo2::virtual_hook(int /*id*/, void */*data*/) /* KBASE::virtual_hook(id, data); */ } -#include "kcolorcombo2.moc" #endif // USE_NEW_KCOLORCOMBO src/kcolorcombo2.cpp @@ -708,4 +708,3 @@ void LinkLookEditWidget::saveToLook(LinkLook *look) m_iconSize->iconSize(), (look->canPreview() ? m_preview->currentItem() : LinkLook::None) ); } -#include "linklabel.moc" src/linklabel.cpp @@ -349,4 +349,3 @@ void MainWindow::minimizeRestore() show(); } -#include "mainwindow.moc" src/mainwindow.cpp @@ -346,4 +346,3 @@ void NewBasketDialog::manageTemplates() KMessageBox::information(this, "Wait a minute! There is no template for now: they will come with time... :-D"); } -#include "newbasketdialog.moc" src/newbasketdialog.cpp @@ -1990,4 +1990,3 @@ void NoteFactory__loadNode(const QDomElement &content, const QString &lowerTypeN else if (lowerTypeName == "unknown") new UnknownContent( parent, content.text() ); } -#include "notecontent.moc" src/notecontent.cpp @@ -597,4 +597,3 @@ bool ExtendedTextDrag::decode(const QMimeSource *e, QString &str, QString &subty return ok; } -#include "notedrag.moc" src/notedrag.cpp @@ -1010,4 +1010,3 @@ QPalette InlineEditors::palette() const return Global::bnpView->currentBasket()->palette(); } -#include "noteedit.moc" src/noteedit.cpp @@ -123,6 +123,5 @@ Password::~Password() { } -#include "password.moc" #endif src/password.cpp @@ -373,4 +373,3 @@ QPoint RegionGrabber::limitPointToRect( const QPoint &p, const QRect &r ) const return q; } -#include "regiongrabber.moc" src/regiongrabber.cpp @@ -990,4 +990,3 @@ void ApplicationsPage::defaults() // TODO } -#include "settings.moc" src/settings.cpp @@ -713,4 +713,3 @@ void SoftwareImporters::importTuxCardsNode(const QDomElement &element, Basket *p } } -#include "softwareimporters.moc" src/softwareimporters.cpp @@ -1220,4 +1220,3 @@ void TagsEditDialog::slotOk() Global::bnpView->recomputeAllStyles(); } -#include "tagsedit.moc" src/tagsedit.cpp @@ -336,4 +336,3 @@ int FontSizeCombo::fontSize() return font().pointSize(); } -#include "variouswidgets.moc" src/variouswidgets.cpp 3e88c23f538b3579f3ca91c260f9fe5416b04f89 Kelvie Wong kelvie@ieee.org http://github.com/kelvie/basket/commit/88d5f45f46a18fff3b09f0bccc9e3344070921f7 88d5f45f46a18fff3b09f0bccc9e3344070921f7 2008-06-21T18:10:36-07:00 2008-06-21T18:10:36-07:00 Don't include moc files. When #include.*\.moc is inside an #if, it confuses automoc. The solution is then to remove all of these lines (as it seems like they are unneeded). 5f7a99c0c8073098182431670265f1d2307f55d6 Kelvie Wong kelvie@ieee.org