more fixes

8 files changed, 10 insertions, 7 deletions

diff --git a/noncore/.cvsignore b/noncore/.cvsignore
index c9bb88e..83ee49f 100644
--- a/noncore/.cvsignore
+++ b/noncore/.cvsignore
@@ -1,3 +1,4 @@
 Makefile*
 moc_*
-*.moc
\ No newline at end of file
+*.moc
+bin
\ No newline at end of file
diff --git a/noncore/apps/dictionary/dictionary.pro b/noncore/apps/dictionary/dictionary.pro
index 34c06e3..b3b5052 100644
--- a/noncore/apps/dictionary/dictionary.pro
+++ b/noncore/apps/dictionary/dictionary.pro
@@ -1,29 +1,29 @@
 TEMPLATE	= app
 CONFIG		+= qt warn_on release
-DESTDIR		= ../bin
+DESTDIR		= $(OPIEDIR)/bin
 
 HEADERS	= dicttool.h
 SOURCES	= dicttool.cpp main.cpp
 
 INTERFACES	= dicttoolbase.ui
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe
 
 TARGET		= dictionary
 
 TRANSLATIONS    = ../i18n/pt_BR/dictionary.ts
 TRANSLATIONS    += ../i18n/pt/dictionary.ts
 TRANSLATIONS   += ../i18n/de/dictionary.ts
 TRANSLATIONS   += ../i18n/en/dictionary.ts
 TRANSLATIONS   += ../i18n/hu/dictionary.ts
 TRANSLATIONS   += ../i18n/sl/dictionary.ts
 TRANSLATIONS   += ../i18n/pl/dictionary.ts
 TRANSLATIONS   += ../i18n/fr/dictionary.ts
 TRANSLATIONS   += ../i18n/ja/dictionary.ts
 TRANSLATIONS   += ../i18n/ko/dictionary.ts
 TRANSLATIONS   += ../i18n/no/dictionary.ts
 TRANSLATIONS   += ../i18n/zh_CN/dictionary.ts
 TRANSLATIONS   += ../i18n/zh_TW/dictionary.ts
 TRANSLATIONS   += ../i18n/es/dictionary.ts
diff --git a/noncore/apps/tableviewer/tableviewer.pro b/noncore/apps/tableviewer/tableviewer.pro
index 86f6b0e..48a132e 100644
--- a/noncore/apps/tableviewer/tableviewer.pro
+++ b/noncore/apps/tableviewer/tableviewer.pro
@@ -1,51 +1,51 @@
 TEMPLATE	= app
 CONFIG		= qt warn_on debug
-DESTDIR		= ../bin
+DESTDIR		= $(OPIEDIR)/bin
 SUBDIRS		= db ui
 HEADERS		= tableviewer.h \
 		  ui/commonwidgets.h \
 		  ui/tvbrowseview.h \
 		  ui/tvlistview.h \
 		  ui/tvfilterview.h \
 		  ui/tveditview.h \
 		  ui/browsekeyentry.h \
 		  ui/filterkeyentry.h \
 		  ui/tvkeyedit.h \
 		  db/datacache.h \
 		  db/common.h \
 		  db/xmlsource.h \
 		  db/csvsource.h
 SOURCES		= main.cpp \
 		  tableviewer.cpp \
 		  ui/commonwidgets.cpp \
 		  ui/tvbrowseview.cpp \
 		  ui/tvfilterview.cpp \
 		  ui/browsekeyentry.cpp \
 		  ui/filterkeyentry.cpp \
 		  ui/tvlistview.cpp \
 		  ui/tveditview.cpp \
 		  ui/tvkeyedit.cpp \
 		  db/datacache.cpp \
 		  db/xmlsource.cpp \
 		  db/csvsource.cpp \
 		  db/common.cpp
 INTERFACES	= ui/tvkeyedit_gen.ui
 TARGET		= tableviewer
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH     += $(OPIEDIR)/include
 LIBS	       += -lqpe
 
 TRANSLATIONS = ../i18n/pt_BR/tableviewer.ts
 TRANSLATIONS += ../i18n/es/tableviewer.ts
 TRANSLATIONS += ../i18n/pt/tableviewer.ts
 TRANSLATIONS   += ../i18n/en/tableviewer.ts
 TRANSLATIONS   += ../i18n/de/tableviewer.ts
 TRANSLATIONS   += ../i18n/hu/tableviewer.ts
 TRANSLATIONS   += ../i18n/pl/tableviewer.ts
 TRANSLATIONS   += ../i18n/ja/tableviewer.ts
 TRANSLATIONS   += ../i18n/sl/tableviewer.ts
 TRANSLATIONS   += ../i18n/fr/tableviewer.ts
 TRANSLATIONS   += ../i18n/ko/tableviewer.ts
 TRANSLATIONS   += ../i18n/no/tableviewer.ts
 TRANSLATIONS   += ../i18n/zh_CN/tableviewer.ts
 TRANSLATIONS   += ../i18n/zh_TW/tableviewer.ts
diff --git a/noncore/comm/keypebble/keypebble.pro b/noncore/comm/keypebble/keypebble.pro
index 93b81f9..e175a42 100644
--- a/noncore/comm/keypebble/keypebble.pro
+++ b/noncore/comm/keypebble/keypebble.pro
@@ -1,52 +1,52 @@
 TEMPLATE        = app
 
 CONFIG          += qt warn_on release
-DESTDIR         = ../bin
+DESTDIR         = $(OPIEDIR)/bin
 
 HEADERS		= d3des.h \
 		  krfbbuffer.h \
 		  krfbcanvas.h \
 		  krfbconnection.h \
 		  krfbdecoder.h \
 		  krfblogin.h \
 		  krfboptions.h \
 		  krfbserverinfo.h \
 		  kvnc.h \
 		  kvncconnectdlg.h \
 		  kvncoptionsdlg.h \
 		  version.h \
 		  vncauth.h
 
 SOURCES		= d3des.c \
 		  vncauth.c \
 		  krfbbuffer.cpp \
 		  krfbcanvas.cpp \
 		  krfbconnection.cpp \
 		  krfbdecoder.cpp \
 		  krfblogin.cpp \
 		  krfboptions.cpp \
 		  kvnc.cpp \
 		  kvncconnectdlg.cpp \
 		  kvncoptionsdlg.cpp \
 		  main.cpp
 INTERFACES	= vncoptionsbase.ui
 TARGET          = keypebble
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 
 TRANSLATIONS = ../i18n/pt_BR/keypebble.ts
 TRANSLATIONS += ../i18n/es/keypebble.ts
 TRANSLATIONS += ../i18n/pt/keypebble.ts
 TRANSLATIONS   += ../i18n/de/keypebble.ts
 TRANSLATIONS   += ../i18n/en/keypebble.ts
 TRANSLATIONS   += ../i18n/hu/keypebble.ts
 TRANSLATIONS   += ../i18n/sl/keypebble.ts
 TRANSLATIONS   += ../i18n/fr/keypebble.ts
 TRANSLATIONS   += ../i18n/pl/keypebble.ts
 TRANSLATIONS   += ../i18n/ja/keypebble.ts
 TRANSLATIONS   += ../i18n/ko/keypebble.ts
 TRANSLATIONS   += ../i18n/no/keypebble.ts
 TRANSLATIONS   += ../i18n/zh_CN/keypebble.ts
 TRANSLATIONS   += ../i18n/zh_TW/keypebble.ts
diff --git a/noncore/games/fifteen/fifteen.pro b/noncore/games/fifteen/fifteen.pro
index 964b816..ae8778e 100644
--- a/noncore/games/fifteen/fifteen.pro
+++ b/noncore/games/fifteen/fifteen.pro
@@ -1,25 +1,25 @@
-DESTDIR		= ../bin
+DESTDIR		= $(OPIEDIR)/bin
 TEMPLATE	= app
 CONFIG		= qt warn_on release
 HEADERS		= fifteen.h
 SOURCES		= fifteen.cpp \
 		main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe
 TARGET		= fifteen
 
 TRANSLATIONS = ../i18n/pt_BR/fifteen.ts
 TRANSLATIONS += ../i18n/es/fifteen.ts
 TRANSLATIONS += ../i18n/pt/fifteen.ts
 TRANSLATIONS   += ../i18n/de/fifteen.ts
 TRANSLATIONS   += ../i18n/en/fifteen.ts
 TRANSLATIONS   += ../i18n/hu/fifteen.ts
 TRANSLATIONS   += ../i18n/pl/fifteen.ts
 TRANSLATIONS   += ../i18n/ja/fifteen.ts
 TRANSLATIONS   += ../i18n/sl/fifteen.ts
 TRANSLATIONS   += ../i18n/ko/fifteen.ts
 TRANSLATIONS   += ../i18n/fr/fifteen.ts
 TRANSLATIONS   += ../i18n/no/fifteen.ts
 TRANSLATIONS   += ../i18n/zh_CN/fifteen.ts
 TRANSLATIONS   += ../i18n/zh_TW/fifteen.ts
diff --git a/noncore/games/go/go.pro b/noncore/games/go/go.pro
index f9084a8..90a00a2 100644
--- a/noncore/games/go/go.pro
+++ b/noncore/games/go/go.pro
@@ -1,32 +1,32 @@
-DESTDIR		= ../bin
+DESTDIR		= $(OPIEDIR)/bin
 TEMPLATE	= app
 CONFIG		= qt warn_on release
 HEADERS		= amigo.h \
 		  go.h \
 		  goplayutils.h \
 		  gowidget.h
 SOURCES		= amigo.c \
 		goplayer.c \
 		goplayutils.c \
 		killable.c \
 		gowidget.cpp \
 		main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe
 TARGET		= go
 
 TRANSLATIONS = ../i18n/de/go.ts
 TRANSLATIONS += ../i18n/es/go.ts
 TRANSLATIONS += ../i18n/pt/go.ts
 TRANSLATIONS += ../i18n/pt_BR/go.ts
 TRANSLATIONS   += ../i18n/en/go.ts
 TRANSLATIONS   += ../i18n/hu/go.ts
 TRANSLATIONS   += ../i18n/ja/go.ts
 TRANSLATIONS   += ../i18n/fr/go.ts
 TRANSLATIONS   += ../i18n/sl/go.ts
 TRANSLATIONS   += ../i18n/pl/go.ts
 TRANSLATIONS   += ../i18n/ko/go.ts
 TRANSLATIONS   += ../i18n/no/go.ts
 TRANSLATIONS   += ../i18n/zh_CN/go.ts
 TRANSLATIONS   += ../i18n/zh_TW/go.ts
diff --git a/noncore/games/tetrix/tetrix.pro b/noncore/games/tetrix/tetrix.pro
index 56310d7..52ae49f 100644
--- a/noncore/games/tetrix/tetrix.pro
+++ b/noncore/games/tetrix/tetrix.pro
@@ -1,32 +1,32 @@
 TEMPLATE	= app
 CONFIG		= qt warn_on release
-DESTDIR		= ../bin
+DESTDIR		= $(OPIEDIR)/bin
 HEADERS		= minefield.h \
 		    gtetrix.h \
 		    qtetrix.h \
 		    qtetrixb.h \
 		    tpiece.h
 SOURCES		= main.cpp \
 		    gtetrix.cpp \
 		    qtetrix.cpp \
 		    qtetrixb.cpp \
 		    tpiece.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe
 INTERFACES	= 
 
 TRANSLATIONS = ../i18n/pt_BR/tetrix.ts
 TRANSLATIONS += ../i18n/es/tetrix.ts
 TRANSLATIONS += ../i18n/pt/tetrix.ts
 TRANSLATIONS   += ../i18n/de/tetrix.ts
 TRANSLATIONS   += ../i18n/en/tetrix.ts
 TRANSLATIONS   += ../i18n/fr/tetrix.ts
 TRANSLATIONS   += ../i18n/hu/tetrix.ts
 TRANSLATIONS   += ../i18n/sl/tetrix.ts
 TRANSLATIONS   += ../i18n/ja/tetrix.ts
 TRANSLATIONS   += ../i18n/ko/tetrix.ts
 TRANSLATIONS   += ../i18n/no/tetrix.ts
 TRANSLATIONS   += ../i18n/zh_CN/tetrix.ts
 TRANSLATIONS   += ../i18n/pl/tetrix.ts
 TRANSLATIONS   += ../i18n/zh_TW/tetrix.ts
diff --git a/noncore/net/.cvsignore b/noncore/net/.cvsignore
new file mode 100644
index 0000000..21bc64c
--- a/dev/null
+++ b/noncore/net/.cvsignore
@@ -0,0 +1,2 @@
+bin
+plugins
\ No newline at end of file