Bladeren bron

Rename a number of classes to enhance compatibility with KDE4

tags/r14.0.0
Timothy Pearson 6 jaren geleden
bovenliggende
commit
7f80a1ffb7
10 gewijzigde bestanden met toevoegingen van 90 en 90 verwijderingen
  1. 1
    1
      TODO
  2. 71
    71
      src/knowit.cpp
  3. 10
    10
      src/knowit.h
  4. 2
    2
      src/knowitlinks.cpp
  5. 1
    1
      src/knowitlinks.h
  6. 1
    1
      src/knowitpref.cpp
  7. 1
    1
      src/knowittray.cpp
  8. 1
    1
      src/knowittray.h
  9. 1
    1
      src/knowittree.cpp
  10. 1
    1
      src/knowittree.h

+ 1
- 1
TODO Bestand weergeven

@@ -55,7 +55,7 @@ Import/export:
* optionally print/export links

Internals:
* make some actions KSelectActions (f. e. alignment)
* make some actions TDESelectActions (f. e. alignment)
* undo for deleting/moving notes (how?)
* check accelerators?


+ 71
- 71
src/knowit.cpp Bestand weergeven

@@ -57,7 +57,7 @@

const TQString Knowit::Untitled = i18n("untitled") + ".kno";

Knowit::Knowit(TQWidget*, const char *name) : KMainWindow(0, name),
Knowit::Knowit(TQWidget*, const char *name) : TDEMainWindow(0, name),
FindDlg(), PrefDlg(), ChooserDlg(), LinkDlg(), Notes()
{

@@ -77,8 +77,8 @@ Knowit::Knowit(TQWidget*, const char *name) : KMainWindow(0, name),
setCentralWidget(Layout);

TQWhatsThis::add(Layout, i18n("Move it to change tree/edit layout."));
connect(Items, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)));
connect(Items, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
connect(Items, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this,
TQT_SLOT(slotItemChanged(TQListViewItem*)));
connect(Items, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this,
@@ -96,7 +96,7 @@ Knowit::Knowit(TQWidget*, const char *name) : KMainWindow(0, name),
connect(Edit, TQT_SIGNAL(textDropped(const TQString&, int)),
TQT_TQOBJECT(this), TQT_SLOT(slotLinkDropped(const TQString&, int)));
/* Links (KListBox) */
/* Links (TDEListBox) */
connect(Links, TQT_SIGNAL(doubleClicked(TQListBoxItem*)),
TQT_TQOBJECT(this), TQT_SLOT(slotShowAttachment(TQListBoxItem*)));
connect(Links, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),
@@ -113,10 +113,10 @@ Knowit::Knowit(TQWidget*, const char *name) : KMainWindow(0, name),
actionRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileRecent(const KURL&)), actionCollection());
KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection());
KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection());
new KAction(i18n("&Export to HTML..."), "", "", TQT_TQOBJECT(this),
new TDEAction(i18n("&Export to HTML..."), "", "", TQT_TQOBJECT(this),
TQT_SLOT(slotFileExport()), actionCollection(), "file_export_html");
KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection());
new KAction(i18n("Document &information..."), "", "", TQT_TQOBJECT(this),
new TDEAction(i18n("Document &information..."), "", "", TQT_TQOBJECT(this),
TQT_SLOT(slotFileInfo()), actionCollection(), "file_info");
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection());

@@ -126,49 +126,49 @@ Knowit::Knowit(TQWidget*, const char *name) : KMainWindow(0, name),
KStdAction::paste(TQT_TQOBJECT(Edit), TQT_SLOT(paste()), actionCollection());
actionUndo = KStdAction::undo(TQT_TQOBJECT(Edit), TQT_SLOT(undo()), actionCollection());
actionRedo = KStdAction::redo(TQT_TQOBJECT(Edit), TQT_SLOT(redo()), actionCollection());
actionBold = new KToggleAction(i18n("Toggle &bold"), "text_bold",
actionBold = new TDEToggleAction(i18n("Toggle &bold"), "text_bold",
"Ctrl+B", TQT_TQOBJECT(this), TQT_SLOT(slotEditBold()), actionCollection(), "edit_bold");
actionItalic = new KToggleAction(i18n("Toggle &italic"), "text_italic",
actionItalic = new TDEToggleAction(i18n("Toggle &italic"), "text_italic",
"Ctrl+I", TQT_TQOBJECT(this), TQT_SLOT(slotEditItalic()), actionCollection(),
"edit_italic");
actionUnderline = new KToggleAction(i18n("Toggle &underline"), "text_under",
actionUnderline = new TDEToggleAction(i18n("Toggle &underline"), "text_under",
"Ctrl+U", TQT_TQOBJECT(this), TQT_SLOT(slotEditUnderline()), actionCollection(),
"edit_underline");
new KAction(i18n("&Text color..."), "color_line", "Ctrl+#", TQT_TQOBJECT(this),
new TDEAction(i18n("&Text color..."), "color_line", "Ctrl+#", TQT_TQOBJECT(this),
TQT_SLOT(slotEditColor()), actionCollection(), "edit_color");
new KAction(i18n("&Superscript"), "text_super", "", TQT_TQOBJECT(this),
new TDEAction(i18n("&Superscript"), "text_super", "", TQT_TQOBJECT(this),
TQT_SLOT(slotEditSuperscript()), actionCollection(), "edit_superscript");
new KAction(i18n("&Subscript"), "text_sub", "", TQT_TQOBJECT(this),
new TDEAction(i18n("&Subscript"), "text_sub", "", TQT_TQOBJECT(this),
TQT_SLOT(slotEditSubscript()), actionCollection(), "edit_subscript");
new KAction(i18n("&Normal text"), "", "", TQT_TQOBJECT(this),
new TDEAction(i18n("&Normal text"), "", "", TQT_TQOBJECT(this),
TQT_SLOT(slotEditNormal()), actionCollection(), "edit_align_normal");
new KAction(i18n("&Bullet list"), "", "", TQT_TQOBJECT(this),
new TDEAction(i18n("&Bullet list"), "", "", TQT_TQOBJECT(this),
TQT_SLOT(slotEditListBullet()), actionCollection(), "list_bullet");
new KAction(i18n("&Numbered list"), "", "", TQT_TQOBJECT(this),
new TDEAction(i18n("&Numbered list"), "", "", TQT_TQOBJECT(this),
TQT_SLOT(slotEditListNumber()), actionCollection(), "list_number");
new KAction(i18n("&Uppercase list"), "", "", TQT_TQOBJECT(this),
new TDEAction(i18n("&Uppercase list"), "", "", TQT_TQOBJECT(this),
TQT_SLOT(slotEditListUpper()), actionCollection(), "list_upper");
new KAction(i18n("&Lowercase list"), "", "", TQT_TQOBJECT(this),
new TDEAction(i18n("&Lowercase list"), "", "", TQT_TQOBJECT(this),
TQT_SLOT(slotEditListLower()), actionCollection(), "list_lower");
new KAction(i18n("N&o list"), "", "", TQT_TQOBJECT(this),
new TDEAction(i18n("N&o list"), "", "", TQT_TQOBJECT(this),
TQT_SLOT(slotEditListNone()), actionCollection(), "list_none");
KStdAction::find(TQT_TQOBJECT(&FindDlg), TQT_SLOT(exec()), actionCollection());
KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotEditFindNext()), actionCollection());
new KAction(i18n("&Go to &note..."), "goto", "Ctrl+G", TQT_TQOBJECT(this),
new TDEAction(i18n("&Go to &note..."), "goto", "Ctrl+G", TQT_TQOBJECT(this),
TQT_SLOT(slotEditGoTo()), actionCollection(), "goto_note");
actionEditAlignLeft = new KToggleAction(i18n("Align &left"), "text_left", "Ctrl+L", TQT_TQOBJECT(this),
actionEditAlignLeft = new TDEToggleAction(i18n("Align &left"), "text_left", "Ctrl+L", TQT_TQOBJECT(this),
TQT_SLOT(slotEditAlignLeft()), actionCollection(), "edit_align_left");
actionEditAlignRight = new KToggleAction(i18n("Align &right"), "text_right", "Ctrl+R",
actionEditAlignRight = new TDEToggleAction(i18n("Align &right"), "text_right", "Ctrl+R",
TQT_TQOBJECT(this), TQT_SLOT(slotEditAlignRight()), actionCollection(), "edit_align_right");
actionEditAlignJustify = new KToggleAction(i18n("&Justify"), "text_block", "Ctrl+J",
actionEditAlignJustify = new TDEToggleAction(i18n("&Justify"), "text_block", "Ctrl+J",
TQT_TQOBJECT(this), TQT_SLOT(slotEditAlignJustify()), actionCollection(), "edit_align_justify");
actionEditAlignCenter = new KToggleAction(i18n("&Center"), "text_center", "Ctrl+E", TQT_TQOBJECT(this),
actionEditAlignCenter = new TDEToggleAction(i18n("&Center"), "text_center", "Ctrl+E", TQT_TQOBJECT(this),
TQT_SLOT(slotEditAlignCenter()), actionCollection(), "edit_align_center");
new KAction(i18n("Insert &date"), "date", "F5", TQT_TQOBJECT(this),
new TDEAction(i18n("Insert &date"), "date", "F5", TQT_TQOBJECT(this),
TQT_SLOT(slotEditInsertDate()), actionCollection(), "edit_insert_date");
new KAction(i18n("Insert &file..."), "", "", TQT_TQOBJECT(this),
new TDEAction(i18n("Insert &file..."), "", "", TQT_TQOBJECT(this),
TQT_SLOT(slotEditInsertFile()), actionCollection(), "edit_insert_file");
actionRawTextMode = new KToggleAction(i18n("&Raw Text Mode"),
actionRawTextMode = new TDEToggleAction(i18n("&Raw Text Mode"),
"source", "F10", TQT_TQOBJECT(this), TQT_SLOT(slotRawTextMode()),
actionCollection(), "edit_raw_text");

@@ -181,49 +181,49 @@ Knowit::Knowit(TQWidget*, const char *name) : KMainWindow(0, name),
connect(Edit, TQT_SIGNAL(redoAvailable(bool)), actionRedo, TQT_SLOT(setEnabled(bool)));

/* Actions: notes */
new KAction(i18n("&Add"), "", "Alt+Insert", TQT_TQOBJECT(this), TQT_SLOT(slotNoteAdd()),
new TDEAction(i18n("&Add"), "", "Alt+Insert", TQT_TQOBJECT(this), TQT_SLOT(slotNoteAdd()),
actionCollection(), "note_add");
new KAction(i18n("Add &subnote"), "", "Alt+Shift+Insert", TQT_TQOBJECT(this),
new TDEAction(i18n("Add &subnote"), "", "Alt+Shift+Insert", TQT_TQOBJECT(this),
TQT_SLOT(slotNoteAddChild()), actionCollection(), "note_add_child");
new KAction(i18n("&Delete"), "", "Alt+Delete", TQT_TQOBJECT(this),
new TDEAction(i18n("&Delete"), "", "Alt+Delete", TQT_TQOBJECT(this),
TQT_SLOT(slotNoteRemove()), actionCollection(), "note_delete");
new KAction(i18n("&Rename"), "", "F2", TQT_TQOBJECT(this),
new TDEAction(i18n("&Rename"), "", "F2", TQT_TQOBJECT(this),
TQT_SLOT(slotNoteRename()), actionCollection(), "note_rename");
new KAction(i18n("E&xpand all"), "", "", TQT_TQOBJECT(Items),
new TDEAction(i18n("E&xpand all"), "", "", TQT_TQOBJECT(Items),
TQT_SLOT(slotExpandAll()), actionCollection(), "note_expand_all");
new KAction(i18n("&Expand current"), "", "Alt++", TQT_TQOBJECT(Items),
new TDEAction(i18n("&Expand current"), "", "Alt++", TQT_TQOBJECT(Items),
TQT_SLOT(slotExpand()), actionCollection(), "note_expand");
new KAction(i18n("Co&llapse all"), "", "", TQT_TQOBJECT(Items),
new TDEAction(i18n("Co&llapse all"), "", "", TQT_TQOBJECT(Items),
TQT_SLOT(slotCollapseAll()), actionCollection(), "note_collapse_all");
new KAction(i18n("&Collapse current"), "", "Alt+-", TQT_TQOBJECT(Items),
new TDEAction(i18n("&Collapse current"), "", "Alt+-", TQT_TQOBJECT(Items),
TQT_SLOT(slotCollapse()), actionCollection(), "note_collapse");
new KAction(i18n("Move up"), "up", "Alt+Shift+Up", TQT_TQOBJECT(this),
new TDEAction(i18n("Move up"), "up", "Alt+Shift+Up", TQT_TQOBJECT(this),
TQT_SLOT(slotNoteMoveUp()), actionCollection(), "note_move_up");
new KAction(i18n("Move down"), "down", "Alt+Shift+Down", TQT_TQOBJECT(this),
new TDEAction(i18n("Move down"), "down", "Alt+Shift+Down", TQT_TQOBJECT(this),
TQT_SLOT(slotNoteMoveDown()), actionCollection(), "note_move_down");
new KAction(i18n("Move level up"), "back", "Alt+Shift+Left", TQT_TQOBJECT(this),
new TDEAction(i18n("Move level up"), "back", "Alt+Shift+Left", TQT_TQOBJECT(this),
TQT_SLOT(slotNoteMoveLeft()), actionCollection(), "note_move_left");
new KAction(i18n("Move level down"), "forward", "Alt+Shift+Right", TQT_TQOBJECT(this),
new TDEAction(i18n("Move level down"), "forward", "Alt+Shift+Right", TQT_TQOBJECT(this),
TQT_SLOT(slotNoteMoveRight()), actionCollection(), "note_move_right");
new KAction(i18n("Move at the beginning"), "top", "Alt+Shift+Home", TQT_TQOBJECT(this),
new TDEAction(i18n("Move at the beginning"), "top", "Alt+Shift+Home", TQT_TQOBJECT(this),
TQT_SLOT(slotNoteMoveBegin()), actionCollection(), "note_move_begin");
new KAction(i18n("Move at the end"), "bottom", "Alt+Shift+End", TQT_TQOBJECT(this),
new TDEAction(i18n("Move at the end"), "bottom", "Alt+Shift+End", TQT_TQOBJECT(this),
TQT_SLOT(slotNoteMoveEnd()), actionCollection(), "note_move_end");
new KAction(i18n("Sort"), "", "", TQT_TQOBJECT(this),
new TDEAction(i18n("Sort"), "", "", TQT_TQOBJECT(this),
TQT_SLOT(slotNoteSort()), actionCollection(), "note_sort");

/* Actions: Links */
new KAction(i18n("&Add link..."), "attach", "Ctrl+Shift+I", TQT_TQOBJECT(this),
new TDEAction(i18n("&Add link..."), "attach", "Ctrl+Shift+I", TQT_TQOBJECT(this),
TQT_SLOT(slotLinkAdd()), actionCollection(), "link_add");
new KAction(i18n("&Remove link"), "", "", TQT_TQOBJECT(this),
new TDEAction(i18n("&Remove link"), "", "", TQT_TQOBJECT(this),
TQT_SLOT(slotLinkRemove()), actionCollection(), "link_remove");
new KAction(i18n("Open link"), "run", "", TQT_TQOBJECT(this),
new TDEAction(i18n("Open link"), "run", "", TQT_TQOBJECT(this),
TQT_SLOT(slotLinkOpen()), actionCollection(), "link_open");
new KAction(i18n("Open link with..."), "", "", TQT_TQOBJECT(this),
new TDEAction(i18n("Open link with..."), "", "", TQT_TQOBJECT(this),
TQT_SLOT(slotLinkOpenWith()), actionCollection(), "link_open_with");
new KAction(i18n("&Modify link..."), "", "", TQT_TQOBJECT(this),
new TDEAction(i18n("&Modify link..."), "", "", TQT_TQOBJECT(this),
TQT_SLOT(slotLinkModify()), actionCollection(), "link_modify");
new KAction(i18n("&Copy link location"), "", "", TQT_TQOBJECT(this),
new TDEAction(i18n("&Copy link location"), "", "", TQT_TQOBJECT(this),
TQT_SLOT(slotLinkCopy()), actionCollection(), "link_copy");

/* Actions: Options */
@@ -232,27 +232,27 @@ Knowit::Knowit(TQWidget*, const char *name) : KMainWindow(0, name),
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotOptions()), actionCollection());
/* Actions: Help */
new KAction(i18n("&Tip of the day"), "idea", "", TQT_TQOBJECT(this),
new TDEAction(i18n("&Tip of the day"), "idea", "", TQT_TQOBJECT(this),
TQT_SLOT(slotHelpTip()), actionCollection(), "help_tip");

/* Actions: nonplugged */
new KAction(i18n("Minimize"), "", "", TQT_TQOBJECT(this), TQT_SLOT(showMinimized()),
new TDEAction(i18n("Minimize"), "", "", TQT_TQOBJECT(this), TQT_SLOT(showMinimized()),
actionCollection(), "window_minimize");
new KAction(i18n("Switch area"), "", "Ctrl+M", TQT_TQOBJECT(this),
new TDEAction(i18n("Switch area"), "", "Ctrl+M", TQT_TQOBJECT(this),
TQT_SLOT(slotEditSwitch()), actionCollection(), "edit_switch");
new KAction(i18n("Overwrite Mode"), "", "Insert", TQT_TQOBJECT(this),
new TDEAction(i18n("Overwrite Mode"), "", "Insert", TQT_TQOBJECT(this),
TQT_SLOT(slotOverwriteModeChange()), actionCollection(), "overwrite_mode_change");
new KAction(i18n("Go to previous note"), "", "Alt+Up", TQT_TQOBJECT(Items),
new TDEAction(i18n("Go to previous note"), "", "Alt+Up", TQT_TQOBJECT(Items),
TQT_SLOT(slotItemUp()), actionCollection(), "note_previous");
new KAction(i18n("Go to next note"), "", "Alt+Down", TQT_TQOBJECT(Items),
new TDEAction(i18n("Go to next note"), "", "Alt+Down", TQT_TQOBJECT(Items),
TQT_SLOT(slotItemDown()), actionCollection(), "note_next");
new KAction(i18n("Go to first note"), "", "Alt+Home", TQT_TQOBJECT(Items),
new TDEAction(i18n("Go to first note"), "", "Alt+Home", TQT_TQOBJECT(Items),
TQT_SLOT(slotItemBegin()), actionCollection(), "note_begin");
new KAction(i18n("Go to last note"), "", "Alt+End", TQT_TQOBJECT(Items),
new TDEAction(i18n("Go to last note"), "", "Alt+End", TQT_TQOBJECT(Items),
TQT_SLOT(slotItemEnd()), actionCollection(), "note_end");
new KAction(i18n("Go to first subnote"), "", "Alt+Right", TQT_TQOBJECT(Items),
new TDEAction(i18n("Go to first subnote"), "", "Alt+Right", TQT_TQOBJECT(Items),
TQT_SLOT(slotItemRight()), actionCollection(), "note_right");
new KAction(i18n("Go to parent note"), "", "Alt+Left", TQT_TQOBJECT(Items),
new TDEAction(i18n("Go to parent note"), "", "Alt+Left", TQT_TQOBJECT(Items),
TQT_SLOT(slotItemLeft()), actionCollection(), "note_left");

/* Actions */
@@ -349,16 +349,16 @@ bool Knowit::open(const KURL& fname)
name = ls.readLine();
name = name.stripWhiteSpace();
if (depth == prevdepth) /* same level */
if (depth) current = new KListViewItem(current->parent(), current, name);
else current = new KListViewItem(Items, current, name);
if (depth) current = new TDEListViewItem(current->parent(), current, name);
else current = new TDEListViewItem(Items, current, name);
else if (depth > prevdepth) /* subnote */
current = new KListViewItem(current, name);
current = new TDEListViewItem(current, name);
else { /* parent note */
for(uint i=depth; i<prevdepth && current; i++)
current = current->parent();
if (current && current->parent())
current = new KListViewItem(current->parent(), current, name);
else current = new KListViewItem(Items, current, name);
current = new TDEListViewItem(current->parent(), current, name);
else current = new TDEListViewItem(Items, current, name);
}
prevdepth = depth;
Notes.addNote(current);
@@ -431,7 +431,7 @@ void Knowit::closeEvent(TQCloseEvent* e)
{
if (!Options.docked || ((KnowitApplication*)kapp)->closeByLogout()) {
saveOptions();
KMainWindow::closeEvent(e);
TDEMainWindow::closeEvent(e);
}
else
hide();
@@ -601,7 +601,7 @@ void Knowit::slotStatusMsg(const TQString &text)
}


void Knowit::slotContextMenu(KListView*, TQListViewItem*, const TQPoint& p)
void Knowit::slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint& p)
{
TQWidget *w = factory()->container("notes_popup", this);
if (w)
@@ -622,18 +622,18 @@ void Knowit::slotContextLinksMenu(TQListBoxItem*, const TQPoint& p)
void Knowit::slotNoteAdd()
{
bool Ok;
KListViewItem* elt;
TDEListViewItem* elt;
TQString text = KInputDialog::getText(i18n("Add note"),
i18n("Note title:"), Options.defaultName, &Ok);
if (!Ok) return;
if (Items->currentItem())
if (Items->currentItem()->parent())
elt = new KListViewItem(Items->currentItem()->parent(),
elt = new TDEListViewItem(Items->currentItem()->parent(),
Items->currentItem(), text);
else
elt = new KListViewItem(Items, Items->currentItem(), text);
elt = new TDEListViewItem(Items, Items->currentItem(), text);
else
elt = new KListViewItem(Items, text);
elt = new TDEListViewItem(Items, text);
Notes.addNote(elt);
slotNoteChanged(elt);
if (Notes.count() == 1)
@@ -654,11 +654,11 @@ void Knowit::slotNoteAddChild()
while (lastChild && lastChild->nextSibling())
lastChild = lastChild->nextSibling();

KListViewItem* elt;
TDEListViewItem* elt;
if (lastChild)
elt = new KListViewItem(Items->currentItem(), lastChild, text);
elt = new TDEListViewItem(Items->currentItem(), lastChild, text);
else
elt = new KListViewItem(Items->currentItem(), text);
elt = new TDEListViewItem(Items->currentItem(), text);
Notes.addNote(elt);
slotNoteChanged(elt);
}

+ 10
- 10
src/knowit.h Bestand weergeven

@@ -36,11 +36,11 @@

class TQSplitter;
class TQTimer;
class KAction;
class TDEAction;
class TDEConfig;
class KListBox;
class KToggleAction;
class KRecentFilesAction;
class TDEListBox;
class TDEToggleAction;
class TDERecentFilesAction;

class KnowitTray;
class KnowitEdit;
@@ -48,7 +48,7 @@ class KnowitTree;

/** Knowit is the base class of the project */
class Knowit : public KMainWindow
class Knowit : public TDEMainWindow
{
Q_OBJECT
@@ -57,7 +57,7 @@ class Knowit : public KMainWindow
TDEConfig *config;
TQSplitter* Layout;
KnowitTree* Items;
KListBox* Links;
TDEListBox* Links;
KnowitEdit* Edit;
KURL filename;
TQPixmap pixmapFolder, pixmapFolderText, pixmapText, pixmapEmpty;
@@ -78,11 +78,11 @@ class Knowit : public KMainWindow
/* false by default, set to true on queryClose() */
bool shuttingDown;
/* actions */
KRecentFilesAction *actionRecent;
KToggleAction *actionBold, *actionItalic, *actionUnderline,
TDERecentFilesAction *actionRecent;
TDEToggleAction *actionBold, *actionItalic, *actionUnderline,
*actionEditAlignLeft, *actionEditAlignRight, *actionEditAlignCenter,
*actionEditAlignJustify, *actionRawTextMode;
KAction *actionCut, *actionCopy, *actionUndo, *actionRedo;
TDEAction *actionCut, *actionCopy, *actionUndo, *actionRedo;

/** Insert/Overwrite status */
enum {StatusText = 1, StatusOvr = 2};
@@ -123,7 +123,7 @@ class Knowit : public KMainWindow
/** Status bar text has changed - displays it */
void slotStatusMsg(const TQString& text);
/** Shows requested popup menu for notes */
void slotContextMenu(KListView*, TQListViewItem*, const TQPoint&);
void slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&);
/** Shows given note */
void slotNoteChanged(TQListViewItem* item);
/** Add same-level note */

+ 2
- 2
src/knowitlinks.cpp Bestand weergeven

@@ -20,7 +20,7 @@
#include <kurldrag.h>

KnowitLinks::KnowitLinks(TQWidget* parent, const char* name)
: KListBox(parent, name)
: TDEListBox(parent, name)
{
setAcceptDrops(true);
}
@@ -52,5 +52,5 @@ void KnowitLinks::keyPressEvent(TQKeyEvent* e)
e->ignore();
emit linkRemove();
}
else KListBox::keyPressEvent(e);
else TDEListBox::keyPressEvent(e);
}

+ 1
- 1
src/knowitlinks.h Bestand weergeven

@@ -23,7 +23,7 @@ class TQDropEvent;
class TQKeyEvent;
class TQDragEnterEvent;

class KnowitLinks : public KListBox
class KnowitLinks : public TDEListBox
{
Q_OBJECT

+ 1
- 1
src/knowitpref.cpp Bestand weergeven

@@ -223,7 +223,7 @@ KnowitPreferences::KnowitPreferences()

const char fontSizes[] = {4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,22,24,26,28,32,48,64,0};
TQStringList fontList;
KFontChooser::getFontList(fontList, false);
TDEFontChooser::getFontList(fontList, false);

TQHBox* fontBox = new TQHBox(page);
layout->addWidget(fontBox);

+ 1
- 1
src/knowittray.cpp Bestand weergeven

@@ -25,7 +25,7 @@ KnowitTray::KnowitTray (TQWidget* parent, const char* name) :
TQT_SLOT(slotUndock()));
}

void KnowitTray::contextMenuAboutToShow (KPopupMenu* menu)
void KnowitTray::contextMenuAboutToShow (TDEPopupMenu* menu)
{
menu->removeItemAt(menu->count()-1);
menu->insertItem(i18n("&Quit"), parent(), TQT_SLOT(slotFileQuit()));

+ 1
- 1
src/knowittray.h Bestand weergeven

@@ -24,7 +24,7 @@ class KnowitTray : public KSystemTray
public:
KnowitTray(TQWidget* parent=0, const char* name=0);
protected:
virtual void contextMenuAboutToShow (KPopupMenu* menu);
virtual void contextMenuAboutToShow (TDEPopupMenu* menu);
};

#endif

+ 1
- 1
src/knowittree.cpp Bestand weergeven

@@ -23,7 +23,7 @@
#include "knowittree.h"

KnowitTree::KnowitTree(TQWidget* parent, const char* name)
: KListView(parent, name)
: TDEListView(parent, name)
{
setMinimumSize(150, 150);
addColumn(i18n("Notes"));

+ 1
- 1
src/knowittree.h Bestand weergeven

@@ -18,7 +18,7 @@
#define __KNOWIT_TREE_H__
#include <klistview.h>
class TQDragMoveEvent;
class KnowitTree : public KListView
class KnowitTree : public TDEListView
{
Q_OBJECT

Laden…
Annuleren
Opslaan