summaryrefslogtreecommitdiff
authorzecke <zecke>2002-03-22 23:09:26 (UTC)
committer zecke <zecke>2002-03-22 23:09:26 (UTC)
commit5c17e8b168cf27ac2922e7c118cb886b116eab42 (patch) (unidiff)
tree5ba4ad0f08f9e93c62b95545d97a462f6924e45c
parent232a5bed633ba2aa96fcab73ff991ab3a796ad76 (diff)
downloadopie-5c17e8b168cf27ac2922e7c118cb886b116eab42.zip
opie-5c17e8b168cf27ac2922e7c118cb886b116eab42.tar.gz
opie-5c17e8b168cf27ac2922e7c118cb886b116eab42.tar.bz2
make some people happy update
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcher.cpp1
-rw-r--r--core/launcher/mediummountgui.cpp1
-rw-r--r--libopie/oconfig.h2
3 files changed, 3 insertions, 1 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index dcc3ba1..1c38a05 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -536,24 +536,25 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global::
536 qWarning("time stamp match" ); 536 qWarning("time stamp match" );
537 cfg.writeEntry("timestamp", newStamp ); 537 cfg.writeEntry("timestamp", newStamp );
538 // we need to scan the list now. Hopefully the cache will be there 538 // we need to scan the list now. Hopefully the cache will be there
539 }else{ // come up with the gui 539 }else{ // come up with the gui
540 qWarning("time stamp doesn't match" ); 540 qWarning("time stamp doesn't match" );
541 MediumMountGui medium((*it)->path() ); 541 MediumMountGui medium((*it)->path() );
542 qWarning("medium mount gui created" ); 542 qWarning("medium mount gui created" );
543 if( medium.check() ){ 543 if( medium.check() ){
544 qWarning("need to check this device" ); 544 qWarning("need to check this device" );
545 if( medium.exec() ){ //ok 545 if( medium.exec() ){ //ok
546 // speicher 546 // speicher
547 qWarning("execed" ); 547 qWarning("execed" );
548 cfg.read();
548 cfg.writeEntry("timestamp", newStamp ); 549 cfg.writeEntry("timestamp", newStamp );
549 } 550 }
550 }else{ 551 }else{
551 qWarning("wrong :(" ); 552 qWarning("wrong :(" );
552 // do something different see what we need to do 553 // do something different see what we need to do
553 } 554 }
554 } 555 }
555 } 556 }
556 } 557 }
557 qWarning("findDocuments" ); 558 qWarning("findDocuments" );
558 Global::findDocuments(docsFolder); // get rid of this call later 559 Global::findDocuments(docsFolder); // get rid of this call later
559 qWarning("done" ); 560 qWarning("done" );
diff --git a/core/launcher/mediummountgui.cpp b/core/launcher/mediummountgui.cpp
index 5225711..e3fa5bd 100644
--- a/core/launcher/mediummountgui.cpp
+++ b/core/launcher/mediummountgui.cpp
@@ -91,24 +91,25 @@ void MediumMountGui::writeConfig(bool autocheck) {
91 mimeTypeList += ("text//*"); 91 mimeTypeList += ("text//*");
92 } 92 }
93 if (checkmimevideo) { 93 if (checkmimevideo) {
94 mimeTypeList += ("video//*"); 94 mimeTypeList += ("video//*");
95 } 95 }
96 if (checkmimeimage) { 96 if (checkmimeimage) {
97 mimeTypeList += ("image//*"); 97 mimeTypeList += ("image//*");
98 } 98 }
99 if (checkmimeall) { 99 if (checkmimeall) {
100 mimeTypeList << ("null"); 100 mimeTypeList << ("null");
101 } 101 }
102 } 102 }
103 cfg.write();
103} 104}
104 105
105void MediumMountGui::startGui() { 106void MediumMountGui::startGui() {
106 107
107 QPixmap image = Resource::loadPixmap( "HelpBrowser"); 108 QPixmap image = Resource::loadPixmap( "HelpBrowser");
108 109
109 Text_2 = new QLabel( this ); 110 Text_2 = new QLabel( this );
110 Text_2->setGeometry( QRect( 10, 15, 40, 40 ) ); 111 Text_2->setGeometry( QRect( 10, 15, 40, 40 ) );
111 Text_2->setPixmap( image ); 112 Text_2->setPixmap( image );
112 113
113 Text = new QLabel( this, "Text" ); 114 Text = new QLabel( this, "Text" );
114 Text->setGeometry( QRect( 55, 11, this->width()-50, 50 ) ); 115 Text->setGeometry( QRect( 55, 11, this->width()-50, 50 ) );
diff --git a/libopie/oconfig.h b/libopie/oconfig.h
index c97fb6a..f6227d1 100644
--- a/libopie/oconfig.h
+++ b/libopie/oconfig.h
@@ -32,17 +32,17 @@
32#ifndef opieconfig_h 32#ifndef opieconfig_h
33#define opieconfig_h 33#define opieconfig_h
34 34
35/** It supports all Config items + it lets you decide 35/** It supports all Config items + it lets you decide
36 * which file to use. 36 * which file to use.
37 */ 37 */
38 38
39class OConfig : public Config { 39class OConfig : public Config {
40 public: 40 public:
41 OConfig( const QString &filename ); 41 OConfig( const QString &filename );
42 ~OConfig(); 42 ~OConfig();
43 QString fileName() const; 43 QString fileName() const;
44 44 void read( ) { Config::read(); };
45}; 45};
46 46
47#endif 47#endif
48 48