author | sandman <sandman> | 2002-10-21 12:39:51 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-21 12:39:51 (UTC) |
commit | 32817a02b4fae7010e7ef1212916168845a58831 (patch) (unidiff) | |
tree | 9859d99a7e507859d06d6e9f2a03a3b8efb046a8 | |
parent | cdaf60fdf5dc19e88db4faa319daacfe4e879518 (diff) | |
download | opie-32817a02b4fae7010e7ef1212916168845a58831.zip opie-32817a02b4fae7010e7ef1212916168845a58831.tar.gz opie-32817a02b4fae7010e7ef1212916168845a58831.tar.bz2 |
Get rid of the QDir::readDirEntries: Cannot read the directory:
/opt/QtPalmtop/plugins/fontfactories message if no fontfactories are
installed -- this seems to confuse users
-rw-r--r-- | library/fontdatabase.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp index 147134c..899d5cf 100644 --- a/library/fontdatabase.cpp +++ b/library/fontdatabase.cpp | |||
@@ -116,96 +116,100 @@ QStringList FontDatabase::families() const | |||
116 | return list; | 116 | return list; |
117 | #endif | 117 | #endif |
118 | } | 118 | } |
119 | 119 | ||
120 | #ifdef QT_NO_FONTDATABASE | 120 | #ifdef QT_NO_FONTDATABASE |
121 | /*! | 121 | /*! |
122 | Returns a list of standard fontsizes. | 122 | Returns a list of standard fontsizes. |
123 | */ | 123 | */ |
124 | QValueList<int> FontDatabase::standardSizes() | 124 | QValueList<int> FontDatabase::standardSizes() |
125 | { | 125 | { |
126 | static int s[]={ 8, 9, 10, 11, 12, 14, 16, 18, 20, 22, 24, 26, 28, | 126 | static int s[]={ 8, 9, 10, 11, 12, 14, 16, 18, 20, 22, 24, 26, 28, |
127 | 36, 48, 72, 0 }; | 127 | 36, 48, 72, 0 }; |
128 | static bool first = TRUE; | 128 | static bool first = TRUE; |
129 | static QValueList<int> sList; | 129 | static QValueList<int> sList; |
130 | if ( first ) { | 130 | if ( first ) { |
131 | first = FALSE; | 131 | first = FALSE; |
132 | int i = 0; | 132 | int i = 0; |
133 | while( s[i] ) | 133 | while( s[i] ) |
134 | sList.append( s[i++] ); | 134 | sList.append( s[i++] ); |
135 | } | 135 | } |
136 | return sList; | 136 | return sList; |
137 | } | 137 | } |
138 | 138 | ||
139 | #endif | 139 | #endif |
140 | 140 | ||
141 | /*! | 141 | /*! |
142 | Load any font renderer plugins that are available and make the fonts | 142 | Load any font renderer plugins that are available and make the fonts |
143 | that the plugins can read available. | 143 | that the plugins can read available. |
144 | */ | 144 | */ |
145 | void FontDatabase::loadRenderers() | 145 | void FontDatabase::loadRenderers() |
146 | { | 146 | { |
147 | #ifndef QT_NO_COMPONENT | 147 | #ifndef QT_NO_COMPONENT |
148 | if ( !factoryList ) | 148 | if ( !factoryList ) |
149 | factoryList = new QValueList<FontFactory>; | 149 | factoryList = new QValueList<FontFactory>; |
150 | 150 | ||
151 | QValueList<FontFactory>::Iterator mit; | 151 | QValueList<FontFactory>::Iterator mit; |
152 | for ( mit = factoryList->begin(); mit != factoryList->end(); ++mit ) { | 152 | for ( mit = factoryList->begin(); mit != factoryList->end(); ++mit ) { |
153 | qt_fontmanager->factories.setAutoDelete( false ); | 153 | qt_fontmanager->factories.setAutoDelete( false ); |
154 | qt_fontmanager->factories.removeRef( (*mit).factory ); | 154 | qt_fontmanager->factories.removeRef( (*mit).factory ); |
155 | qt_fontmanager->factories.setAutoDelete( true ); | 155 | qt_fontmanager->factories.setAutoDelete( true ); |
156 | (*mit).interface->release(); | 156 | (*mit).interface->release(); |
157 | (*mit).library->unload(); | 157 | (*mit).library->unload(); |
158 | delete (*mit).library; | 158 | delete (*mit).library; |
159 | } | 159 | } |
160 | factoryList->clear(); | 160 | factoryList->clear(); |
161 | 161 | ||
162 | QString path = QPEApplication::qpeDir() + "/plugins/fontfactories"; | 162 | QString path = QPEApplication::qpeDir() + "/plugins/fontfactories"; |
163 | QDir dir( path, "lib*.so" ); | 163 | QDir dir( path, "lib*.so" ); |
164 | |||
165 | if ( !dir.exists()) | ||
166 | return; | ||
167 | |||
164 | QStringList list = dir.entryList(); | 168 | QStringList list = dir.entryList(); |
165 | QStringList::Iterator it; | 169 | QStringList::Iterator it; |
166 | for ( it = list.begin(); it != list.end(); ++it ) { | 170 | for ( it = list.begin(); it != list.end(); ++it ) { |
167 | FontFactoryInterface *iface = 0; | 171 | FontFactoryInterface *iface = 0; |
168 | QLibrary *lib = new QLibrary( path + "/" + *it ); | 172 | QLibrary *lib = new QLibrary( path + "/" + *it ); |
169 | if ( lib->queryInterface( IID_FontFactory, (QUnknownInterface**)&iface ) == QS_OK ) { | 173 | if ( lib->queryInterface( IID_FontFactory, (QUnknownInterface**)&iface ) == QS_OK ) { |
170 | FontFactory factory; | 174 | FontFactory factory; |
171 | factory.library = lib; | 175 | factory.library = lib; |
172 | factory.interface = iface; | 176 | factory.interface = iface; |
173 | factory.factory = factory.interface->fontFactory(); | 177 | factory.factory = factory.interface->fontFactory(); |
174 | factoryList->append( factory ); | 178 | factoryList->append( factory ); |
175 | qt_fontmanager->factories.append( factory.factory ); | 179 | qt_fontmanager->factories.append( factory.factory ); |
176 | readFonts( factory.factory ); | 180 | readFonts( factory.factory ); |
177 | } else { | 181 | } else { |
178 | delete lib; | 182 | delete lib; |
179 | } | 183 | } |
180 | } | 184 | } |
181 | #endif | 185 | #endif |
182 | } | 186 | } |
183 | 187 | ||
184 | /*! | 188 | /*! |
185 | \internal | 189 | \internal |
186 | */ | 190 | */ |
187 | void FontDatabase::readFonts( QFontFactory *factory ) | 191 | void FontDatabase::readFonts( QFontFactory *factory ) |
188 | { | 192 | { |
189 | // Load in font definition file | 193 | // Load in font definition file |
190 | QString fn = fontDir() + "fontdir"; | 194 | QString fn = fontDir() + "fontdir"; |
191 | FILE* fontdef=fopen(fn.local8Bit(),"r"); | 195 | FILE* fontdef=fopen(fn.local8Bit(),"r"); |
192 | if(!fontdef) { | 196 | if(!fontdef) { |
193 | QCString temp=fn.local8Bit(); | 197 | QCString temp=fn.local8Bit(); |
194 | qWarning("Cannot find font definition file %s - is $QTDIR set correctly?", | 198 | qWarning("Cannot find font definition file %s - is $QTDIR set correctly?", |
195 | temp.data()); | 199 | temp.data()); |
196 | return; | 200 | return; |
197 | } | 201 | } |
198 | char buf[200]=""; | 202 | char buf[200]=""; |
199 | char name[200]=""; | 203 | char name[200]=""; |
200 | char render[200]=""; | 204 | char render[200]=""; |
201 | char file[200]=""; | 205 | char file[200]=""; |
202 | char flags[200]=""; | 206 | char flags[200]=""; |
203 | char isitalic[10]=""; | 207 | char isitalic[10]=""; |
204 | fgets(buf,200,fontdef); | 208 | fgets(buf,200,fontdef); |
205 | while(!feof(fontdef)) { | 209 | while(!feof(fontdef)) { |
206 | if ( buf[0] != '#' ) { | 210 | if ( buf[0] != '#' ) { |
207 | int weight=50; | 211 | int weight=50; |
208 | int size=0; | 212 | int size=0; |
209 | flags[0]=0; | 213 | flags[0]=0; |
210 | sscanf(buf,"%s %s %s %s %d %d %s",name,file,render,isitalic,&weight,&size,flags); | 214 | sscanf(buf,"%s %s %s %s %d %d %s",name,file,render,isitalic,&weight,&size,flags); |
211 | QString filename; | 215 | QString filename; |