summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-10 19:42:59 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-10 19:42:59 +0000
commitb850ef000c0a7aa22cc8e2011c710e01a1687d04 (patch)
treec607b81ddc444186e44a4f7b3cd42468916bdd27
parent2d32173ea834f6570c3a787acabad95ecd07f070 (diff)
downloadtdeedu-b850ef00.tar.gz
tdeedu-b850ef00.zip
Fix some kdeedu build problems
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1258254 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kalzium/configure.in.in2
-rw-r--r--kalzium/src/spectrumviewimpl.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/kalzium/configure.in.in b/kalzium/configure.in.in
index 757485ad..24a74adc 100644
--- a/kalzium/configure.in.in
+++ b/kalzium/configure.in.in
@@ -50,7 +50,7 @@ if test "x$with_ocamlsolver" != xno; then
EQCHEM_SUB=solver
OCAMLLIB=`ocamlc -where`
FACILELIB=`ocamlc -where`/facile
- EQCHEM_LDADD="-lasmrun -lstr -lnums -lm -ldl solver.o modwrap.o"
+ EQCHEM_LDADD="-lasmrun -lnums -lm -ldl solver.o modwrap.o"
AC_DEFINE(HAVE_FACILE, 1)
fi
diff --git a/kalzium/src/spectrumviewimpl.cpp b/kalzium/src/spectrumviewimpl.cpp
index c4a5617a..826c008b 100644
--- a/kalzium/src/spectrumviewimpl.cpp
+++ b/kalzium/src/spectrumviewimpl.cpp
@@ -39,7 +39,8 @@ void SpectrumViewImpl::slotExportAsImage()
this, i18n( "Save Spectrum" ) );
if( !fileName.isEmpty() )
{
- if ( !exporter->saveAsImage( &m_spectrumWidget->pixmap(), fileName ) )
+ TQPixmap swpm = m_spectrumWidget->pixmap();
+ if ( !exporter->saveAsImage( &swpm, fileName ) )
KMessageBox::error( this, i18n( "The spectrum could not be saved" ), i18n( "Image Could Not Be Saved") );
}
delete exporter;