summaryrefslogtreecommitdiffstats
path: root/kexi
diff options
context:
space:
mode:
Diffstat (limited to 'kexi')
-rw-r--r--kexi/3rdparty/kexisql/Makefile.msvc7
-rw-r--r--kexi/3rdparty/kolibs/Makefile.am8
-rw-r--r--kexi/3rdparty/kolibs/koGlobal.cpp (renamed from kexi/3rdparty/kolibs/koGlobal.cc)0
-rw-r--r--kexi/3rdparty/kolibs/koPageLayoutDia.cpp (renamed from kexi/3rdparty/kolibs/koPageLayoutDia.cc)0
-rw-r--r--kexi/3rdparty/kolibs/koUnit.cpp (renamed from kexi/3rdparty/kolibs/koUnit.cc)0
-rw-r--r--kexi/3rdparty/kolibs/koUnitWidgets.cpp (renamed from kexi/3rdparty/kolibs/koUnitWidgets.cc)0
-rw-r--r--kexi/doc/dev/TODO-Kexi-js2
-rw-r--r--kexi/plugins/importexport/csv/kexicsvimportdialog.cpp2
-rw-r--r--kexi/plugins/importexport/csv/kexicsvimportdialog.h2
-rwxr-xr-xkexi/tools/build_tarball/build_kexi_tarball.sh2
10 files changed, 9 insertions, 14 deletions
diff --git a/kexi/3rdparty/kexisql/Makefile.msvc b/kexi/3rdparty/kexisql/Makefile.msvc
index e6fae477..01e3028f 100644
--- a/kexi/3rdparty/kexisql/Makefile.msvc
+++ b/kexi/3rdparty/kexisql/Makefile.msvc
@@ -107,18 +107,13 @@ TARGET = $(TDEDIR)/bin/kexisql2_d.dll
####### Implicit rules
-.SUFFIXES: .c .cpp .cc .cxx .C
+.SUFFIXES: .c .cpp .cxx .C
{.}.cpp{obj\}.obj::
$(CXX) -c $(CXXFLAGS) $(INCPATH) -Foobj\ @<<
$<
<<
-{.}.cc{obj\}.obj::
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -Foobj\ @<<
- $<
-<<
-
{.}.cxx{obj\}.obj::
$(CXX) -c $(CXXFLAGS) $(INCPATH) -Foobj\ @<<
$<
diff --git a/kexi/3rdparty/kolibs/Makefile.am b/kexi/3rdparty/kolibs/Makefile.am
index 05d3fbd3..c5b1cf7b 100644
--- a/kexi/3rdparty/kolibs/Makefile.am
+++ b/kexi/3rdparty/kolibs/Makefile.am
@@ -3,10 +3,10 @@ include $(top_srcdir)/kexi/Makefile.global
noinst_LTLIBRARIES = libkexikolibs.la
libkexikolibs_la_SOURCES = \
-koGlobal.cc \
-koUnit.cc \
-koUnitWidgets.cc \
-koPageLayoutDia.cc \
+koGlobal.cpp \
+koUnit.cpp \
+koUnitWidgets.cpp \
+koPageLayoutDia.cpp \
KoPageLayoutColumnsBase.ui \
KoPageLayoutColumns.cpp \
koPageLayout.cpp \
diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cpp
index a375327f..a375327f 100644
--- a/kexi/3rdparty/kolibs/koGlobal.cc
+++ b/kexi/3rdparty/kolibs/koGlobal.cpp
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cc b/kexi/3rdparty/kolibs/koPageLayoutDia.cpp
index 2f0db91a..2f0db91a 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.cc
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cpp
diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cpp
index a2eb289a..a2eb289a 100644
--- a/kexi/3rdparty/kolibs/koUnit.cc
+++ b/kexi/3rdparty/kolibs/koUnit.cpp
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cpp
index 097dfc25..097dfc25 100644
--- a/kexi/3rdparty/kolibs/koUnitWidgets.cc
+++ b/kexi/3rdparty/kolibs/koUnitWidgets.cpp
diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js
index 880c0d13..90b7d5f6 100644
--- a/kexi/doc/dev/TODO-Kexi-js
+++ b/kexi/doc/dev/TODO-Kexi-js
@@ -607,7 +607,7 @@ for blobs...The client has to read the _entire_ blob into memory."; use:
- port to libpq
- set version information in drv_useDatabase()
There's connection_base::server_version() in libpqxx trunk -
- http://thaiopensource.org/development/libpqxx/file/trunk/include/pqxx/connection_base.hxx
+ http://thaiopensource.org/development/libpqxx/file/trunk/include/pqxx/connection_base.h
=== KEXIDB TESTS===
- add tests for DatabaseProperties
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index a1b1c6ea..cf660477 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -1,7 +1,7 @@
/* This file is part of the KDE project
Copyright (C) 2005-2006 Jaroslaw Staniek <[email protected]>
- This work is based on kspread/dialogs/kspread_dlg_csv.cc
+ This work is based on kspread/dialogs/kspread_dlg_csv.cpp
and will be merged back with KOffice libraries.
Copyright (C) 2002-2003 Norbert Andres <[email protected]>
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.h b/kexi/plugins/importexport/csv/kexicsvimportdialog.h
index 4df8a621..52724ca6 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.h
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.h
@@ -1,7 +1,7 @@
/* This file is part of the KDE project
Copyright (C) 2005-2006 Jaroslaw Staniek <[email protected]>
- This work is based on kspread/dialogs/kspread_dlg_csv.cc
+ This work is based on kspread/dialogs/kspread_dlg_csv.cpp
and will be merged back with KOffice libraries.
Copyright (C) 2002-2003 Norbert Andres <[email protected]>
diff --git a/kexi/tools/build_tarball/build_kexi_tarball.sh b/kexi/tools/build_tarball/build_kexi_tarball.sh
index efc607df..3159d815 100755
--- a/kexi/tools/build_tarball/build_kexi_tarball.sh
+++ b/kexi/tools/build_tarball/build_kexi_tarball.sh
@@ -187,7 +187,7 @@ for dir in $EXC; do
mkdir $dir
done
#fix exectutable bits for sources:
-find . -name \*.h -o -name \*.cpp -o -name \*.c -o -name \*.cc -o -name \*.1 | xargs chmod a-x
+find . -name \*.h -o -name \*.cpp -o -name \*.c -o -name \*.1 | xargs chmod a-x
#other app-specific fixes:
fixAppSpecific