summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/tools/quicklauncher/.cvsignore4
-rw-r--r--core/tools/quicklauncher/Makefile238
-rw-r--r--core/tools/quicklauncher/Makefile.in106
-rw-r--r--core/tools/quicklauncher/dropins.h61
-rw-r--r--core/tools/quicklauncher/main.cpp12
-rw-r--r--core/tools/quicklauncher/quicklauncher.pro10
6 files changed, 81 insertions, 350 deletions
diff --git a/core/tools/quicklauncher/.cvsignore b/core/tools/quicklauncher/.cvsignore
new file mode 100644
index 0000000..2a38e61
--- a/dev/null
+++ b/core/tools/quicklauncher/.cvsignore
@@ -0,0 +1,4 @@
1Makefile
2*.moc
3.moc/
4.obj/ \ No newline at end of file
diff --git a/core/tools/quicklauncher/Makefile b/core/tools/quicklauncher/Makefile
deleted file mode 100644
index 23b2fd0..0000000
--- a/core/tools/quicklauncher/Makefile
+++ b/dev/null
@@ -1,238 +0,0 @@
1#############################################################################
2# Automatically generated from tools/quicklauncher/Makefile.in
3# Build options from
4#############################################################################
5
6default: all # package
7
8CONTROL = tools/quicklauncher/qpe-quicklauncher.control
9
10# Compiling
11 INTERFACE_DECL_PATH = .
12 SYSCONF_CXX = g++
13 SYSCONF_CC = gcc
14 DASHCROSS =
15
16# Compiling with support libraries
17 SYSCONF_CXXFLAGS_X11=
18 SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include
19 SYSCONF_CXXFLAGS_QTOPIA= -I$(QPEDIR)/include
20 SYSCONF_CFLAGS_QTOPIA= -I$(QPEDIR)/include
21 SYSCONF_CXXFLAGS_OPENGL= -I/usr/X11R6/include
22
23# Compiling YACC output
24SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
25
26# Linking with support libraries
27 SYSCONF_RPATH_X11=
28 SYSCONF_RPATH_QT= -Wl,-rpath,$(QTDIR)/lib
29 SYSCONF_RPATH_QTOPIA= -Wl,-rpath,$(QPEDIR)/lib
30 SYSCONF_RPATH_OPENGL= -Wl,-rpath,/usr/X11R6/lib
31
32# Linking with support libraries
33# X11
34 SYSCONF_LFLAGS_X11=
35 SYSCONF_LIBS_X11=
36# Qt, Qt+OpenGL
37 SYSCONF_LFLAGS_QT= -L$(QTDIR)/lib
38 SYSCONF_LFLAGS_QTOPIA= -L$(QPEDIR)/lib
39 SYSCONF_LIBS_QT = -lqte$(QT_THREAD_SUFFIX)
40 SYSCONF_LIBS_QT_OPENGL=
41 SYSCONF_LIBS_QTOPIA= -lqtopia
42# OpenGL
43 SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib
44 SYSCONF_LIBS_OPENGL=
45# Yacc
46 SYSCONF_LIBS_YACC=
47
48# Linking applications
49 SYSCONF_LINK = gcc
50 SYSCONF_LFLAGS =
51 SYSCONF_LIBS =
52
53# Link flags for shared objects
54 SYSCONF_LFLAGS_SHOBJ= -shared
55
56# Flags for threading
57 SYSCONF_CFLAGS_THREAD= -D_REENTRANT
58 SYSCONF_CXXFLAGS_THREAD= -D_REENTRANT
59 SYSCONF_LFLAGS_THREAD=
60 SYSCONF_LIBS_THREAD= -lpthread
61
62# Meta-object compiler
63 SYSCONF_MOC = $(QTDIR)/bin/moc
64
65# UI compiler
66 SYSCONF_UIC = $(QTDIR)/bin/uic
67
68# Linking shared libraries
69# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2
70# - Place target in $(DESTDIR) - which has a trailing /
71# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
72#
73 SYSCONF_LINK_SHLIB= gcc
74 SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
75 SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
76 $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
77 $(OBJECTS) $(OBJMOC) $(LIBS) && \
78 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
79 cd $(DESTDIR) && \
80 rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
81 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
82 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
83 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
84
85# Linking static libraries
86# - Build the $(TARGET) library, eg. lib$(TARGET).a
87# - Place target in $(DESTDIR) - which has a trailing /
88#
89 SYSCONF_AR = ar cqs
90SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
91 SYSCONF_LINK_LIB_STATIC= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
92 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
93# Compiling application source
94 SYSCONF_CXXFLAGS= -pipe -DQWS -fno-exceptions -fno-rtti -O2 -Wall -W -DNO_DEBUG
95 SYSCONF_CFLAGS = -pipe -O2 -Wall -W
96# Default link type (static linking is still be used where required)
97 SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_SHARED)
98 SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_SHARED)
99# Compiling library source
100 SYSCONF_CXXFLAGS_LIB= -fPIC
101 SYSCONF_CFLAGS_LIB= -fPIC
102# Compiling shared-object source
103 SYSCONF_CXXFLAGS_SHOBJ= -fPIC
104 SYSCONF_CFLAGS_SHOBJ= -fPIC
105# Linking Qt
106 SYSCONF_LIBS_QTLIB= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT)
107# Linking Qt applications
108 SYSCONF_LIBS_QTAPP=
109
110# Platform output directories
111MOC_DIR = .moc/linux-generic-g++/
112OBJECTS_DIR = .obj/linux-generic-g++/
113
114#############################################################################
115
116####### Compiler, tools and options
117
118 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
119 CXXFLAGS=$(SYSCONF_CXXFLAGS_QTOPIA) $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DQTOPIA_APP_INTERFACE
120 CC =$(SYSCONF_CC) $(QT_C_MT)
121 CFLAGS =$(SYSCONF_CFLAGS_QTOPIA) $(SYSCONF_CFLAGS) -DQTOPIA_APP_INTERFACE
122 INCPATH =-I$(MOC_DIR)
123 LFLAGS =$(SYSCONF_LFLAGS_QTOPIA) $(SYSCONF_RPATH_QTOPIA) $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
124 LIBS =$(SUBLIBS) -lqpepim -lpthread -lqpe $(SYSCONF_LIBS_QTOPIA) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
125 MOC =$(SYSCONF_MOC)
126 UIC =$(SYSCONF_UIC)
127
128####### Target
129
130DESTDIR = $(QPEDIR)/bin/
131VER_MAJ = 1
132VER_MIN = 0
133VER_PATCH = 0
134 TARGET= quicklauncher
135TARGET1 = lib$(TARGET).so.$(VER_MAJ)
136
137####### Files
138
139 HEADERS =
140 SOURCES =main.cpp
141 OBJECTS =$(OBJECTS_DIR)/main.o
142INTERFACES =
143UICDECLS =
144UICIMPLS =
145 SRCMOC =$(MOC_DIR)/main.moc
146 OBJMOC =
147
148
149####### Implicit rules
150
151.SUFFIXES: .cpp .cxx .cc .C .c
152
153.cpp.o:
154 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
155
156.cxx.o:
157 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
158
159.cc.o:
160 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
161
162.C.o:
163 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
164
165.c.o:
166 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
167
168####### Build rules
169
170
171all: $(DESTDIR)$(TARGET)
172
173$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
174 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
175
176moc: $(SRCMOC)
177
178tmake:
179 tmake quicklauncher.pro
180
181clean:
182 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
183 -rm -f *~ core
184 -rm -f allmoc.cpp
185
186####### Extension Modules
187
188listpromodules:
189 @echo
190
191listallmodules:
192 @echo
193
194listaddonpromodules:
195 @echo
196
197listaddonentmodules:
198 @echo
199
200
201REQUIRES=
202
203####### Sub-libraries
204
205
206###### Combined headers
207
208
209
210####### Compile
211
212$(OBJECTS_DIR)/main.o: main.cpp \
213 $(MOC_DIR)/main.moc
214 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/main.o main.cpp
215
216$(MOC_DIR)/main.moc: main.cpp
217 $(MOC) main.cpp -o $(MOC_DIR)/main.moc
218
219
220
221lupdate-check:
222 @true
223
224lupdate:
225 @true
226
227lrelease:
228 @echo "No TRANSLATIONS"
229
230
231ipkg: $(DESTDIR)$(TARGET) # among other things...
232 CTL="$(CONTROL)"; for ctrl in $$CTL; do cd $(QPEDIR)/ipkg; ../bin/mkipks -platform generic $(QPEDIR)/src/$$ctrl ; done
233
234package: ipkg
235 cd $(QPEDIR)/ipkg; ../bin/mkPackages
236
237Makefile: quicklauncher.pro
238 cd $(QPEDIR)/src; ./configure -platform generic -make tools/quicklauncher
diff --git a/core/tools/quicklauncher/Makefile.in b/core/tools/quicklauncher/Makefile.in
deleted file mode 100644
index 8c7892a..0000000
--- a/core/tools/quicklauncher/Makefile.in
+++ b/dev/null
@@ -1,106 +0,0 @@
1#############################################################################
2
3####### Compiler, tools and options
4
5 CXX =$(SYSCONF_CXX) $(QT_CXX_MT)
6 CXXFLAGS=$(SYSCONF_CXXFLAGS_QTOPIA) $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DQTOPIA_APP_INTERFACE
7 CC =$(SYSCONF_CC) $(QT_C_MT)
8 CFLAGS =$(SYSCONF_CFLAGS_QTOPIA) $(SYSCONF_CFLAGS) -DQTOPIA_APP_INTERFACE
9 INCPATH =-I$(MOC_DIR)
10 LFLAGS =$(SYSCONF_LFLAGS_QTOPIA) $(SYSCONF_RPATH_QTOPIA) $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
11 LIBS =$(SUBLIBS) -lqpepim -lpthread -lqpe $(SYSCONF_LIBS_QTOPIA) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
12 MOC =$(SYSCONF_MOC)
13 UIC =$(SYSCONF_UIC)
14
15####### Target
16
17DESTDIR = $(QPEDIR)/bin/
18VER_MAJ = 1
19VER_MIN = 0
20VER_PATCH = 0
21 TARGET= quicklauncher
22TARGET1 = lib$(TARGET).so.$(VER_MAJ)
23
24####### Files
25
26 HEADERS =
27 SOURCES =main.cpp
28 OBJECTS =$(OBJECTS_DIR)/main.o
29INTERFACES =
30UICDECLS =
31UICIMPLS =
32 SRCMOC =$(MOC_DIR)/main.moc
33 OBJMOC =
34
35
36####### Implicit rules
37
38.SUFFIXES: .cpp .cxx .cc .C .c
39
40.cpp.o:
41 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
42
43.cxx.o:
44 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
45
46.cc.o:
47 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
48
49.C.o:
50 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
51
52.c.o:
53 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
54
55####### Build rules
56
57
58all: $(DESTDIR)$(TARGET)
59
60$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
61 $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
62
63moc: $(SRCMOC)
64
65tmake:
66 tmake quicklauncher.pro
67
68clean:
69 -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
70 -rm -f *~ core
71 -rm -f allmoc.cpp
72
73####### Extension Modules
74
75listpromodules:
76 @echo
77
78listallmodules:
79 @echo
80
81listaddonpromodules:
82 @echo
83
84listaddonentmodules:
85 @echo
86
87
88REQUIRES=
89
90####### Sub-libraries
91
92
93###### Combined headers
94
95
96
97####### Compile
98
99$(OBJECTS_DIR)/main.o: main.cpp \
100 $(MOC_DIR)/main.moc
101 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/main.o main.cpp
102
103$(MOC_DIR)/main.moc: main.cpp
104 $(MOC) main.cpp -o $(MOC_DIR)/main.moc
105
106
diff --git a/core/tools/quicklauncher/dropins.h b/core/tools/quicklauncher/dropins.h
new file mode 100644
index 0000000..ac8d8cc
--- a/dev/null
+++ b/core/tools/quicklauncher/dropins.h
@@ -0,0 +1,61 @@
1
2#include <qstring.h>
3#include <qtopia/qcom.h>
4#include <qtopia/qlibrary.h>
5#include <qtopia/applicationinterface.h>
6#include <qtopia/resource.h>
7
8#include <opie/owait.h>
9
10#include <qmetaobject.h>
11#include <qmap.h>
12
13namespace Opie {
14
15 struct PluginLoader {
16 PluginLoader( const char* ) {
17 }
18
19 QRESULT queryInterface( const QString& app, const QUuid&, QUnknownInterface** );
20 void releaseInterface( QUnknownInterface* );
21 QMap<QUnknownInterface*, QLibrary*> libs;
22 };
23
24 /*
25 * We can skip installing a Translator here because Opies QPEApplication
26 * will do that in initApp for us as well
27 */
28 QRESULT PluginLoader::queryInterface( const QString& libFile, const QUuid& uuid, QUnknownInterface** iface ) {
29 QRESULT res = QS_FALSE;
30 *iface = 0;
31
32 // Below lines from TT then mine again
33 QString name = libFile;
34 if ( libFile.findRev(".so") == (int)libFile.length()-3 ) {
35 name = libFile.left( libFile.length()-3 );
36 if ( name.find( "lib" ) == 0 )
37 name = name.mid( 3 );
38 }
39 QString path = QPEApplication::qpeDir() + "/plugins/applications/lib"+name+".so";
40
41 QLibrary *lib = new QLibrary( path );
42 if ( lib->queryInterface( uuid, iface ) == QS_OK && iface ) {
43 libs.insert( *iface, lib );
44 res = QS_OK;
45 }
46
47 return res;
48 }
49
50 void PluginLoader::releaseInterface( QUnknownInterface* iface ) {
51 if ( libs.contains( iface ) ) {
52 iface->release();
53 delete libs[iface];
54 libs.remove( iface ); // we only handle pointers so even if the object is not valid the address-space is
55 }
56 }
57
58}
59
60/* small hack ;) */
61using namespace Opie;
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp
index e509908..7d368ab 100644
--- a/core/tools/quicklauncher/main.cpp
+++ b/core/tools/quicklauncher/main.cpp
@@ -24,16 +24,15 @@
24#include <qguardedptr.h> 24#include <qguardedptr.h>
25#include <qcopchannel_qws.h> 25#include <qcopchannel_qws.h>
26#define QTOPIA_INTERNAL_INITAPP 26#define QTOPIA_INTERNAL_INITAPP
27#include <qtopia/timezone.h>
28#include <qtopia/qpeapplication.h> 27#include <qtopia/qpeapplication.h>
29#include <qtopia/resource.h>
30#include <qtopia/pluginloader.h>
31#include <stdio.h> 28#include <stdio.h>
32#include <stdlib.h> 29#include <stdlib.h>
33#include <sys/types.h> 30#include <sys/types.h>
34#include <sys/stat.h> 31#include <sys/stat.h>
35#include <unistd.h> 32#include <unistd.h>
36 33
34#include "dropins.h"
35
37static QPEApplication *app = 0; 36static QPEApplication *app = 0;
38static PluginLoader *loader = 0; 37static PluginLoader *loader = 0;
39static ApplicationInterface *appIface = 0; 38static ApplicationInterface *appIface = 0;
@@ -210,11 +209,18 @@ int main( int argc, char** argv )
210 // Each of the following force internal structures/internal 209 // Each of the following force internal structures/internal
211 // initialization to be performed. This may mean allocating 210 // initialization to be performed. This may mean allocating
212 // memory that is not needed by all applications. 211 // memory that is not needed by all applications.
212#if 0
213 TimeZone::current().isValid(); // popuplate timezone cache 213 TimeZone::current().isValid(); // popuplate timezone cache
214 TimeString::currentDateFormat(); // create internal structures 214 TimeString::currentDateFormat(); // create internal structures
215 TimeString::currentAMPM(); 215 TimeString::currentAMPM();
216#endif
216 Resource::loadIconSet("new"); // do internal init 217 Resource::loadIconSet("new"); // do internal init
217 218
219 /* make sure libopie gets lined in */
220 {
221 OWait item;
222 }
223
218 // Create a widget to force initialization of title bar images, etc. 224 // Create a widget to force initialization of title bar images, etc.
219 QObject::disconnect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit())); 225 QObject::disconnect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit()));
220 QWidget *w = new QWidget(0,0,Qt::WDestructiveClose|Qt::WStyle_ContextHelp|Qt::WStyle_Tool); 226 QWidget *w = new QWidget(0,0,Qt::WDestructiveClose|Qt::WStyle_ContextHelp|Qt::WStyle_Tool);
diff --git a/core/tools/quicklauncher/quicklauncher.pro b/core/tools/quicklauncher/quicklauncher.pro
index 52e2106..6ab5fc8 100644
--- a/core/tools/quicklauncher/quicklauncher.pro
+++ b/core/tools/quicklauncher/quicklauncher.pro
@@ -1,11 +1,15 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qtopia warn_on release 2 CONFIG += qtopia warn_on release
3 DESTDIR = $(QPEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 4
5 HEADERS = 5 HEADERS = dropins.h
6 SOURCES = main.cpp 6 SOURCES = main.cpp
7 INTERFACES= 7 INTERFACES=
8 8
9unix:LIBS += -lqpepim -lpthread 9 INCLUDEPATH+= $(OPIEDIR)/include
10 LIBS += -lqpe -lopie
10 11
11 TARGET = quicklauncher 12 TARGET = quicklauncher
13
14
15include ( $(OPIEDIR)/include.pro ) \ No newline at end of file