diff options
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | krecord.cpp | 13 | ||||
| -rw-r--r-- | krecord.desktop | 2 | ||||
| -rw-r--r-- | krecord.h | 4 | ||||
| -rw-r--r-- | mk/Maintainer.mk | 2 | ||||
| -rw-r--r-- | mk/Variables.mk | 8 |
6 files changed, 12 insertions, 19 deletions
diff --git a/GNUmakefile b/GNUmakefile index c9bfafc..e51221b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -90,7 +90,7 @@ MOCS := krecord.moc sound.moc fft.moc level.moc buffer.moc \ 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) diff --git a/krecord.cpp b/krecord.cpp index fc31bbe..2aae5f9 100644 --- a/krecord.cpp +++ b/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) : KMainWindow(0,"level",WType_TopLevel) topLayout->activate(); } -KLevel::~KLevel() -{ - delete thislevelwidget; - thislevelwidget = NULL; - delete levelwin; - levelwin = NULL; -} - void KLevel::showit() { diff --git a/krecord.desktop b/krecord.desktop index 1e20579..5598038 100644 --- a/krecord.desktop +++ b/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 @@ -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; diff --git a/mk/Maintainer.mk b/mk/Maintainer.mk index 5bf9480..62f02d6 100644 --- a/mk/Maintainer.mk +++ b/mk/Maintainer.mk @@ -1,7 +1,7 @@ # just some maintainer stuff for me ... ######################################################################## -make-sync-dir = $(HOME)/src/gnu-make +make-sync-dir = $(HOME)/projects/gnu-makefiles .PHONY: sync sync:: distclean diff --git a/mk/Variables.mk b/mk/Variables.mk index 930f824..69486f3 100644 --- a/mk/Variables.mk +++ b/mk/Variables.mk @@ -29,9 +29,11 @@ INSTALL_DATA := $(INSTALL) -m 644 INSTALL_DIR := $(INSTALL) -d # cflags -CFLAGS ?= -g -O2 -CFLAGS += -Wall -Wmissing-prototypes -Wstrict-prototypes \ - -Wpointer-arith -Wunused +CFLAGS ?= -g -O2 +CXXFLAGS ?= $(CFLAGS) +CFLAGS += -Wall -Wmissing-prototypes -Wstrict-prototypes \ + -Wpointer-arith -Wunused +CXXFLAGS += -Wall -Wpointer-arith -Wunused # add /usr/local to the search path if something is in there ... ifneq ($(wildcard /usr/local/include/*.h),) |