author | zecke <zecke> | 2004-09-26 13:42:38 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-26 13:42:38 (UTC) |
commit | 77441b90e9b5a4a23b080e7ac53a512abe96f8a9 (patch) (unidiff) | |
tree | 1e2d8eef39f651561f817042fe4319e86156b7a0 /core | |
parent | 358c159e5d4f28eedfbd8e539e4420324c565eba (diff) | |
download | opie-77441b90e9b5a4a23b080e7ac53a512abe96f8a9.zip opie-77441b90e9b5a4a23b080e7ac53a512abe96f8a9.tar.gz opie-77441b90e9b5a4a23b080e7ac53a512abe96f8a9.tar.bz2 |
Fix the indentation...
-rw-r--r-- | core/tools/quicklauncher/main.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp index b1befce..fb2ca44 100644 --- a/core/tools/quicklauncher/main.cpp +++ b/core/tools/quicklauncher/main.cpp | |||
@@ -70,24 +70,25 @@ void setproctitle (const char *fmt,...) { | |||
70 | if (!argv0) | 70 | if (!argv0) |
71 | return; | 71 | return; |
72 | 72 | ||
73 | va_start(ap, fmt); | 73 | va_start(ap, fmt); |
74 | (void) vsnprintf(buf, SPT_BUFSIZE, fmt, ap); | 74 | (void) vsnprintf(buf, SPT_BUFSIZE, fmt, ap); |
75 | va_end(ap); | 75 | va_end(ap); |
76 | 76 | ||
77 | i = strlen (buf); | 77 | i = strlen (buf); |
78 | if (i > argv_lth - 2) { | 78 | if (i > argv_lth - 2) { |
79 | i = argv_lth - 2; | 79 | i = argv_lth - 2; |
80 | buf[i] = '\0'; | 80 | buf[i] = '\0'; |
81 | } | 81 | } |
82 | |||
82 | memset(argv0[0], '\0', argv_lth); /* clear the memory area */ | 83 | memset(argv0[0], '\0', argv_lth); /* clear the memory area */ |
83 | (void) strcpy (argv0[0], buf); | 84 | (void) strcpy (argv0[0], buf); |
84 | 85 | ||
85 | argv0[1] = NULL; | 86 | argv0[1] = NULL; |
86 | } | 87 | } |
87 | #endif | 88 | #endif |
88 | 89 | ||
89 | 90 | ||
90 | class QuickLauncher : public QObject | 91 | class QuickLauncher : public QObject |
91 | { | 92 | { |
92 | Q_OBJECT | 93 | Q_OBJECT |
93 | public: | 94 | public: |
@@ -102,24 +103,25 @@ public: | |||
102 | 103 | ||
103 | static void exec( int /*argc*/, char **argv ) | 104 | static void exec( int /*argc*/, char **argv ) |
104 | { | 105 | { |
105 | QString appName = argv[0]; | 106 | QString appName = argv[0]; |
106 | int sep = appName.findRev( '/' ); | 107 | int sep = appName.findRev( '/' ); |
107 | if ( sep > 0 ) | 108 | if ( sep > 0 ) |
108 | appName = appName.mid( sep+1 ); | 109 | appName = appName.mid( sep+1 ); |
109 | 110 | ||
110 | appIface = 0; | 111 | appIface = 0; |
111 | if ( loader->queryInterface(appName, IID_QtopiaApplication, (QUnknownInterface**)&appIface) == QS_OK ) { | 112 | if ( loader->queryInterface(appName, IID_QtopiaApplication, (QUnknownInterface**)&appIface) == QS_OK ) { |
112 | mainWindow = appIface->createMainWindow( appName ); | 113 | mainWindow = appIface->createMainWindow( appName ); |
113 | } | 114 | } |
115 | |||
114 | if ( mainWindow ) { | 116 | if ( mainWindow ) { |
115 | if ( mainWindow->metaObject()->slotNames().contains("setDocument(const QString&)") ) { | 117 | if ( mainWindow->metaObject()->slotNames().contains("setDocument(const QString&)") ) { |
116 | app->showMainDocumentWidget( mainWindow ); | 118 | app->showMainDocumentWidget( mainWindow ); |
117 | } else { | 119 | } else { |
118 | app->showMainWidget( mainWindow ); | 120 | app->showMainWidget( mainWindow ); |
119 | } | 121 | } |
120 | } else { | 122 | } else { |
121 | owarn << "Could not create application main window" << oendl; | 123 | owarn << "Could not create application main window" << oendl; |
122 | exit(-1); | 124 | exit(-1); |
123 | } | 125 | } |
124 | } | 126 | } |
125 | 127 | ||
@@ -145,28 +147,30 @@ private slots: | |||
145 | QStrList argList; | 147 | QStrList argList; |
146 | argList.append( arg.utf8() ); | 148 | argList.append( arg.utf8() ); |
147 | doQuickLaunch( argList ); | 149 | doQuickLaunch( argList ); |
148 | delete this; | 150 | delete this; |
149 | } | 151 | } |
150 | } | 152 | } |
151 | 153 | ||
152 | private: | 154 | private: |
153 | void doQuickLaunch( QStrList &argList ) | 155 | void doQuickLaunch( QStrList &argList ) |
154 | { | 156 | { |
155 | static int myargc = argList.count(); | 157 | static int myargc = argList.count(); |
156 | static char **myargv = new char *[myargc + 1]; | 158 | static char **myargv = new char *[myargc + 1]; |
159 | |||
157 | for ( int j = 0; j < myargc; j++ ) { | 160 | for ( int j = 0; j < myargc; j++ ) { |
158 | myargv[j] = new char [strlen(argList.at(j))+1]; | 161 | myargv[j] = new char [strlen(argList.at(j))+1]; |
159 | strcpy( myargv[j], argList.at(j) ); | 162 | strcpy( myargv[j], argList.at(j) ); |
160 | } | 163 | } |
164 | |||
161 | myargv[myargc] = NULL; | 165 | myargv[myargc] = NULL; |
162 | #ifdef _OS_LINUX_ | 166 | #ifdef _OS_LINUX_ |
163 | // Change name of process | 167 | // Change name of process |
164 | setproctitle(myargv[0]); | 168 | setproctitle(myargv[0]); |
165 | #endif | 169 | #endif |
166 | 170 | ||
167 | connect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit())); | 171 | connect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit())); |
168 | app->exit_loop(); | 172 | app->exit_loop(); |
169 | app->initApp( myargc, myargv ); | 173 | app->initApp( myargc, myargv ); |
170 | exec( myargc, myargv ); | 174 | exec( myargc, myargv ); |
171 | } | 175 | } |
172 | 176 | ||
@@ -175,26 +179,28 @@ private: | |||
175 | }; | 179 | }; |
176 | 180 | ||
177 | int main( int argc, char** argv ) | 181 | int main( int argc, char** argv ) |
178 | { | 182 | { |
179 | app = new QPEApplication( argc, argv ); | 183 | app = new QPEApplication( argc, argv ); |
180 | 184 | ||
181 | loader = new PluginLoader( "application" ); | 185 | loader = new PluginLoader( "application" ); |
182 | 186 | ||
183 | unsetenv( "LD_BIND_NOW" ); | 187 | unsetenv( "LD_BIND_NOW" ); |
184 | 188 | ||
185 | QCString arg0 = argv[0]; | 189 | QCString arg0 = argv[0]; |
186 | int sep = arg0.findRev( '/' ); | 190 | int sep = arg0.findRev( '/' ); |
191 | |||
187 | if ( sep > 0 ) | 192 | if ( sep > 0 ) |
188 | arg0 = arg0.mid( sep+1 ); | 193 | arg0 = arg0.mid( sep+1 ); |
194 | |||
189 | if ( arg0 != "quicklauncher" ) { | 195 | if ( arg0 != "quicklauncher" ) { |
190 | odebug << "QuickLauncher invoked as: " << arg0.data() << oendl; | 196 | odebug << "QuickLauncher invoked as: " << arg0.data() << oendl; |
191 | QuickLauncher::exec( argc, argv ); | 197 | QuickLauncher::exec( argc, argv ); |
192 | } else { | 198 | } else { |
193 | #ifdef _OS_LINUX_ | 199 | #ifdef _OS_LINUX_ |
194 | // Setup to change proc title | 200 | // Setup to change proc title |
195 | int i; | 201 | int i; |
196 | char **envp = environ; | 202 | char **envp = environ; |
197 | /* Move the environment so we can reuse the memory. | 203 | /* Move the environment so we can reuse the memory. |
198 | * (Code borrowed from sendmail.) */ | 204 | * (Code borrowed from sendmail.) */ |
199 | for (i = 0; envp[i] != NULL; i++) | 205 | for (i = 0; envp[i] != NULL; i++) |
200 | continue; | 206 | continue; |
@@ -216,55 +222,52 @@ int main( int argc, char** argv ) | |||
216 | odebug << "QuickLauncher running" << oendl; | 222 | odebug << "QuickLauncher running" << oendl; |
217 | // Pre-load default fonts | 223 | // Pre-load default fonts |
218 | QFontMetrics fm( QApplication::font() ); | 224 | QFontMetrics fm( QApplication::font() ); |
219 | fm.ascent(); // causes font load. | 225 | fm.ascent(); // causes font load. |
220 | QFont f( QApplication::font() ); | 226 | QFont f( QApplication::font() ); |
221 | f.setWeight( QFont::Bold ); | 227 | f.setWeight( QFont::Bold ); |
222 | QFontMetrics fmb( f ); | 228 | QFontMetrics fmb( f ); |
223 | fmb.ascent(); // causes font load. | 229 | fmb.ascent(); // causes font load. |
224 | 230 | ||
225 | // Each of the following force internal structures/internal | 231 | // Each of the following force internal structures/internal |
226 | // initialization to be performed. This may mean allocating | 232 | // initialization to be performed. This may mean allocating |
227 | // memory that is not needed by all applications. | 233 | // memory that is not needed by all applications. |
228 | #if 0 | ||
229 | TimeZone::current().isValid(); // popuplate timezone cache | ||
230 | TimeString::currentDateFormat(); // create internal structures | ||
231 | TimeString::currentAMPM(); | ||
232 | #endif | ||
233 | Resource::loadIconSet("new"); // do internal init | 234 | Resource::loadIconSet("new"); // do internal init |
234 | 235 | ||
235 | /* make sure libopie gets lined in */ | 236 | /* make sure libopie gets lined in */ |
236 | { | 237 | { |
237 | Opie::Ui::OWait item; | 238 | Opie::Ui::OWait item; |
238 | } | 239 | } |
239 | 240 | ||
240 | // Create a widget to force initialization of title bar images, etc. | 241 | // Create a widget to force initialization of title bar images, etc. |
241 | QObject::disconnect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit())); | 242 | QObject::disconnect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit())); |
242 | QWidget *w = new QWidget(0,0,Qt::WDestructiveClose|Qt::WStyle_ContextHelp|Qt::WStyle_Tool); | 243 | QWidget *w = new QWidget(0,0,Qt::WDestructiveClose|Qt::WStyle_ContextHelp|Qt::WStyle_Tool); |
243 | w->setGeometry( -100, -100, 10, 10 ); | 244 | w->setGeometry( -100, -100, 10, 10 ); |
244 | w->show(); | 245 | w->show(); |
245 | QTimer::singleShot( 0, w, SLOT(close()) ); | 246 | QTimer::singleShot( 0, w, SLOT(close()) ); |
246 | 247 | ||
247 | app->enter_loop(); | 248 | app->enter_loop(); |
248 | } | 249 | } |
249 | 250 | ||
250 | int rv = app->exec(); | 251 | int rv = app->exec(); |
251 | 252 | ||
252 | if ( mainWindow ) | 253 | if ( mainWindow ) |
253 | delete (QWidget*)mainWindow; | 254 | delete (QWidget*)mainWindow; |
254 | |||
255 | delete app; | 255 | delete app; |
256 | |||
256 | if ( appIface ) | 257 | if ( appIface ) |
257 | loader->releaseInterface( appIface ); | 258 | loader->releaseInterface( appIface ); |
258 | delete loader; | 259 | delete loader; |
260 | |||
261 | |||
259 | // Neither QLibrary nor my Dropin is a QObject and they don't depend | 262 | // Neither QLibrary nor my Dropin is a QObject and they don't depend |
260 | // on a qApp so we destroy QWidget::destroyMapper() without | 263 | // on a qApp so we destroy QWidget::destroyMapper() without |
261 | // crashing the app | 264 | // crashing the app |
262 | // | 265 | // |
263 | // The problem is there are some 'static' resources not freed | 266 | // The problem is there are some 'static' resources not freed |
264 | // in the apps and on destructing these objects are not available | 267 | // in the apps and on destructing these objects are not available |
265 | // anymore. In future fix up the apps but for now | 268 | // anymore. In future fix up the apps but for now |
266 | // we just skip deletion and hope things go well -zecke | 269 | // we just skip deletion and hope things go well -zecke |
267 | // delete app; | 270 | // delete app; |
268 | // hack instead -zecke | 271 | // hack instead -zecke |
269 | // delete app->pidChannel; | 272 | // delete app->pidChannel; |
270 | // app->pidChannel = 0; | 273 | // app->pidChannel = 0; |