← Back to branch summary

~ubuntu-branches/ubuntu/hardy/kdebase-workspace/hardy-backports

« back to all changes in this revision

Viewing changes to kcontrol/fonts/fonts.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Richard A. Johnson
  • Date: 2008-05-02 23:57:34 UTC
  • mfrom: (1.2.1 upstream) (20.1.22 hardy)
  • Revision ID: james.westby@ubuntu.com-20080502235734-kwrykz4qcvunwqf4
Tags: 4:4.0.4-0ubuntu1~hardy1
https://launchpad.net/bugs/225994
https://launchpad.net/bugs/220655
* New upstream release (LP: #225994)
* Updated control file (LP: #220655)
* Updated install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
kcontrol/fonts/fonts.cpp
128
128
"aaaaaaaaaaaa",
129
129
"aaaaaaaaaaaa"};
130
130
 
131
 
static QPixmap aaPixmaps[]={ QPixmap(aa_rgb_xpm), QPixmap(aa_bgr_xpm), QPixmap(aa_vrgb_xpm), QPixmap(aa_vbgr_xpm) };
 
131
static const char** aaPixmaps[]={ aa_rgb_xpm, aa_bgr_xpm, aa_vrgb_xpm, aa_vbgr_xpm };
132
132
 
133
133
/**** DLL Interface ****/
134
134
K_PLUGIN_FACTORY(FontFactory, registerPlugin<KFonts>(); )
264
264
  subPixelType->setWhatsThis( subPixelWhatsThis );
265
265
 
266
266
  for(int t=KXftConfig::SubPixel::None+1; t<=KXftConfig::SubPixel::Vbgr; ++t)
267
 
    subPixelType->addItem(aaPixmaps[t-1], i18n(KXftConfig::description((KXftConfig::SubPixel::Type)t).toUtf8()));
 
267
    subPixelType->addItem(QPixmap(aaPixmaps[t-1]), i18n(KXftConfig::description((KXftConfig::SubPixel::Type)t).toUtf8()));
268
268
 
269
269
  QLabel *hintingLabel=new QLabel(i18n("Hinting style: "), mw);
270
270
  layout->addWidget(hintingLabel, 2, 0);