File krecord.diff of Package krecord
--- GNUmakefile
+++ GNUmakefile
@@ -62,7 +62,7 @@ LIB := $(LIB)
HAVE_SOUNDCARD_H := $(call ac_header,soundcard.h)
HAVE_SYS_SOUNDCARD_H := $(call ac_header,sys/soundcard.h)
HAVE_SUN_AUDIOIO_H := $(call ac_header,sun/audioio.h)
-HAVE_LIBQT_MT := $(call ac_lib,qt_wm_state,qt-mt)
+HAVE_LIBQT_MT := $(call ac_lib,qt_badwindow,qt-mt)
endef
# config conditionals
@@ -90,7 +90,7 @@ MOCS := krecord.moc sound.moc fft.mo
oss.moc sunaudio.moc
CXXFLAGS := $(CFLAGS)
-LDLIBS += -lkdeui -lkdecore $(QTLIB) -lXext -lXmu -lX11
+LDLIBS += -lkio -lkdecore $(QTLIB) -lXext -lXmu -lX11
# locales
PO := $(wildcard po/*.po)
--- krecord.cpp
+++ krecord.cpp
@@ -7,7 +7,6 @@
#include <iostream>
#include <qlabel.h>
-#include <qfiledialog.h>
#include <qdragobject.h>
#include <qtooltip.h>
#include <qlayout.h>
@@ -32,6 +31,7 @@
#include <khelpmenu.h>
#include <kmenubar.h>
#include <kpopupmenu.h>
+#include <kfiledialog.h>
#include "sound.h"
#include "fft.h"
@@ -112,7 +112,7 @@ KRecord::KRecord() : KMainWindow(0,"main
klevel = new KLevel(soundcard);
listwidget = new QListBox(this,"bufferlist");
blist = new BufferList(listwidget,soundcard);
- fdialog = new QFileDialog(NULL,"*.wav",NULL,"fdialog",TRUE);
+ fdialog = new KFileDialog(NULL,"*.wav",NULL,"fdialog",TRUE);
accel = new QAccel(this);
globalKapp->setMainWidget(this);
@@ -370,7 +370,6 @@ void KRecord::save_as()
void KRecord::quit_cb()
{
blist->stop();
- delete this;
globalKapp->quit();
}
@@ -594,14 +593,6 @@ KLevel::KLevel(Soundcard *card) : KMainW
topLayout->activate();
}
-KLevel::~KLevel()
-{
- delete thislevelwidget;
- thislevelwidget = NULL;
- delete levelwin;
- levelwin = NULL;
-}
-
void
KLevel::showit()
{
--- krecord.desktop
+++ krecord.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Encoding=UTF-8
-Icon=log
+Icon=krecord
Exec=krecord
DocPath=
Comment=KRecord - a Sound Recorder
--- krecord.h
+++ krecord.h
@@ -23,6 +23,7 @@
#endif
class QDropEvent;
+class KFileDialog;
/* ------------------------------------------------------------------------ */
@@ -45,7 +46,6 @@ class KLevel : public KMainWindow
Q_OBJECT;
public:
KLevel(Soundcard *card);
- ~KLevel();
protected:
void resizeEvent( QResizeEvent * );
@@ -77,7 +77,7 @@ public:
~KRecord();
Soundcard *soundcard;
SoundOptions *soundopts;
- QFileDialog *fdialog;
+ KFileDialog *fdialog;
QAccel *accel;
KFFT *kfft;
KLevel *klevel;
--- mk/Variables.mk
+++ mk/Variables.mk
@@ -23,7 +23,7 @@ CC ?= gcc
CXX ?= g++
MOC ?= $(if $(QTDIR),$(QTDIR)/bin/moc,moc)
INSTALL ?= install
-INSTALL_BINARY := $(INSTALL) -s
+INSTALL_BINARY := $(INSTALL)
INSTALL_SCRIPT := $(INSTALL)
INSTALL_DATA := $(INSTALL) -m 644
INSTALL_DIR := $(INSTALL) -d