diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:21:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:21:49 -0600 |
| commit | 5c0b074b330a2172b0097aed97e2c6f1c99c748d (patch) | |
| tree | 921e0ed383042714273a3af91a1d3ba5d6f9b87b | |
| parent | 43cac3ddf16f99bd14256817d7227c5b30a0af18 (diff) | |
| download | knowit-5c0b074b330a2172b0097aed97e2c6f1c99c748d.tar.gz knowit-5c0b074b330a2172b0097aed97e2c6f1c99c748d.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
| -rw-r--r-- | src/knowitlink.cpp | 2 | ||||
| -rw-r--r-- | src/knowitpref.cpp | 14 | ||||
| -rw-r--r-- | src/notes.cpp | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/knowitlink.cpp b/src/knowitlink.cpp index 00afeb7..cd2d068 100644 --- a/src/knowitlink.cpp +++ b/src/knowitlink.cpp @@ -48,7 +48,7 @@ KnowitLinkDialog::KnowitLinkDialog() linkValue = new KLineEdit("Link text", editBox); linkValue->setMinimumWidth(300); browse = new TQToolButton(editBox, "Browse"); - browse->setIconSet(TQIconSet(KGlobal::iconLoader()->loadIcon("fileopen", + browse->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("fileopen", KIcon::Toolbar, KIcon::SizeSmall))); layout->addItem(new TQSpacerItem(0, 5)); diff --git a/src/knowitpref.cpp b/src/knowitpref.cpp index 05279a4..8b2580f 100644 --- a/src/knowitpref.cpp +++ b/src/knowitpref.cpp @@ -136,7 +136,7 @@ KnowitPreferences::KnowitPreferences() /* first page: General */ page = addPage(i18n("General"), i18n("General options"), - KGlobal::iconLoader()->loadIcon(TQString("configure"), KIcon::Toolbar, KIcon::SizeMedium)); + TDEGlobal::iconLoader()->loadIcon(TQString("configure"), KIcon::Toolbar, KIcon::SizeMedium)); layout = new TQVBoxLayout(page, 0, spacingHint()); layout->addWidget(docked = new TQCheckBox(i18n("&Dock in System tray"), page, "Dock")); layout->addWidget(reopen = new TQCheckBox(i18n("Open &last file on startup"), page, "Reopen")); @@ -168,7 +168,7 @@ KnowitPreferences::KnowitPreferences() /* second page: Interface */ page = addPage(i18n("Interface"), i18n("Interface options"), - KGlobal::iconLoader()->loadIcon(TQString("misc"), KIcon::Toolbar, KIcon::SizeMedium)); + TDEGlobal::iconLoader()->loadIcon(TQString("misc"), KIcon::Toolbar, KIcon::SizeMedium)); layout = new TQVBoxLayout(page, 0, spacingHint()); layout->addWidget(horizontalSplit = new TQCheckBox(i18n("Split window &horizontally"), page, "Split")); TQWhatsThis::add(horizontalSplit, i18n("If this option is set, notes tree will " @@ -205,7 +205,7 @@ KnowitPreferences::KnowitPreferences() /* third page: Editor */ page = addPage(i18n("Editor"), i18n("Editor options"), - KGlobal::iconLoader()->loadIcon(TQString("edit"), KIcon::Toolbar, KIcon::SizeMedium)); + TDEGlobal::iconLoader()->loadIcon(TQString("edit"), KIcon::Toolbar, KIcon::SizeMedium)); layout = new TQVBoxLayout(page, 0, spacingHint()); layout->addWidget(wordwrap = new TQCheckBox(i18n("Use &word wrap"), page, "WordWrap")); @@ -240,7 +240,7 @@ KnowitPreferences::KnowitPreferences() /* fourth page: Templates */ page = addPage(i18n("Templates"), i18n("Templates configuration"), - KGlobal::iconLoader()->loadIcon(TQString("wizard"), KIcon::Toolbar, KIcon::SizeMedium)); + TDEGlobal::iconLoader()->loadIcon(TQString("wizard"), KIcon::Toolbar, KIcon::SizeMedium)); layout = new TQVBoxLayout(page, 0, spacingHint()); TQWhatsThis::add(page, i18n("<html>\n" "<p>These expressions may be used: </p>\n" @@ -276,13 +276,13 @@ KnowitPreferences::KnowitPreferences() insertDateColorButton = new KColorButton(TQColor("Blue"), tmpBox, "InsertDateColorButton"); insertDateFormatEdit = new KLineEdit(tmpBox, "InsertDateFormatEdit"); insertDateItalicButton = new TQToolButton(tmpBox,"InsertDateItalicButton"); - insertDateItalicButton->setIconSet(TQIconSet(KGlobal::iconLoader()->loadIcon("text_italic", KIcon::Toolbar))); + insertDateItalicButton->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("text_italic", KIcon::Toolbar))); insertDateItalicButton->setToggleButton(true); insertDateBoldButton = new TQToolButton(tmpBox,"InsertDateBoldButton"); - insertDateBoldButton->setIconSet(TQIconSet(KGlobal::iconLoader()->loadIcon("text_bold", KIcon::Toolbar))); + insertDateBoldButton->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("text_bold", KIcon::Toolbar))); insertDateBoldButton->setToggleButton(true); insertDateUnderlineButton = new TQToolButton(tmpBox, "InsertDateUnderlineButton"); - insertDateUnderlineButton->setIconSet(TQIconSet(KGlobal::iconLoader()->loadIcon("text_under", KIcon::Toolbar))); + insertDateUnderlineButton->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("text_under", KIcon::Toolbar))); insertDateUnderlineButton->setToggleButton(true); insertDateColorButton->setFixedSize(insertDateBoldButton->sizeHint()); insertDateFormatEdit->setMinimumWidth(6*insertDateBoldButton->sizeHint().width()); diff --git a/src/notes.cpp b/src/notes.cpp index 16ee565..0ecb01f 100644 --- a/src/notes.cpp +++ b/src/notes.cpp @@ -57,7 +57,7 @@ TQString TNoteLink::text(int fmt) const TQPixmap TNoteLink::icon() const { - return KGlobal::iconLoader()->loadIcon(KMimeType::iconForURL(KURL(link)), + return TDEGlobal::iconLoader()->loadIcon(KMimeType::iconForURL(KURL(link)), KIcon::Small); } @@ -85,10 +85,10 @@ bool TNoteLink::isLocalReference() const TNotesCollection::TNotesCollection() { - Pixmaps[0] = KGlobal::iconLoader()->loadIcon("ascii", KIcon::Small); - Pixmaps[1] = KGlobal::iconLoader()->loadIcon("txt", KIcon::Small); - Pixmaps[2] = KGlobal::iconLoader()->loadIcon("folder", KIcon::Small); - Pixmaps[3] = KGlobal::iconLoader()->loadIcon("folder_txt", KIcon::Small); + Pixmaps[0] = TDEGlobal::iconLoader()->loadIcon("ascii", KIcon::Small); + Pixmaps[1] = TDEGlobal::iconLoader()->loadIcon("txt", KIcon::Small); + Pixmaps[2] = TDEGlobal::iconLoader()->loadIcon("folder", KIcon::Small); + Pixmaps[3] = TDEGlobal::iconLoader()->loadIcon("folder_txt", KIcon::Small); modified = false; autoUpdate = true; } |