Kaydet (Commit) da9871c3 authored tarafından Luboš Luňák's avatar Luboš Luňák

do not make Qt3 moc mix KDE3 and TDE slots

Qt3 moc does not understand #ifdef, so filter out unwanted stuff for it.
üst 2e44e813
......@@ -34,6 +34,6 @@ $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/kdefilepicker.moc.cxx :\
$(SRCDIR)/vcl/unx/kde/fpicker/kdefilepicker.hxx \
| $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
$(MOC) -o $@ $<
cat $< | grep -v 'FILTER_OUT_TDE' | $(MOC) -o $@ -f$<
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
......@@ -34,6 +34,6 @@ $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/kdefilepicker.moc.cxx :\
$(SRCDIR)/vcl/unx/kde/fpicker/kdefilepicker.hxx \
| $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
$(MOC) -o $@ $<
cat $< | grep -v 'FILTER_OUT_KDE' | $(MOC) -o $@ -f$<
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
......@@ -114,10 +114,12 @@ protected:
bool canNotifySelection( void ) const { return m_bCanNotifySelection; }
protected slots:
// Qt3 moc does not really understand #ifdef and would process both slots,
// so the FILTER_OUT_FOO tags are used to remove some slots before moc sees them.
#ifdef ENABLE_TDE
void fileHighlightedCommand( const TQString & );
void fileHighlightedCommand( const TQString & ); // FILTER_OUT_TDE
#else // ENABLE_TDE
void fileHighlightedCommand( const QString & );
void fileHighlightedCommand( const QString & ); // FILTER_OUT_KDE
#endif // ENABLE_TDE
void selectionChangedCommand();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment