Ver código fonte

Rename a number of classes to enhance compatibility with KDE4

tags/r14.0.0
Timothy Pearson 6 anos atrás
pai
commit
7f80a1ffb7
10 arquivos alterados com 90 adições e 90 exclusões
  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 Ver arquivo

@@ -55,7 +55,7 @@ Import/export:
55 55
 * optionally print/export links
56 56
 
57 57
 Internals:
58
-* make some actions KSelectActions (f. e. alignment)
58
+* make some actions TDESelectActions (f. e. alignment)
59 59
 * undo for deleting/moving notes (how?)
60 60
 * check accelerators?
61 61
 

+ 71
- 71
src/knowit.cpp Ver arquivo

@@ -57,7 +57,7 @@
57 57
 
58 58
 const TQString Knowit::Untitled = i18n("untitled") + ".kno";
59 59
 
60
-Knowit::Knowit(TQWidget*, const char *name) : KMainWindow(0, name),
60
+Knowit::Knowit(TQWidget*, const char *name) : TDEMainWindow(0, name),
61 61
    FindDlg(), PrefDlg(), ChooserDlg(), LinkDlg(), Notes()
62 62
 {
63 63
 
@@ -77,8 +77,8 @@ Knowit::Knowit(TQWidget*, const char *name) : KMainWindow(0, name),
77 77
    setCentralWidget(Layout);
78 78
 
79 79
    TQWhatsThis::add(Layout, i18n("Move it to change tree/edit layout."));
80
-   connect(Items, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
81
-     TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)));
80
+   connect(Items, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
81
+     TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
82 82
    connect(Items, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this,
83 83
      TQT_SLOT(slotItemChanged(TQListViewItem*)));
84 84
    connect(Items, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this,
@@ -96,7 +96,7 @@ Knowit::Knowit(TQWidget*, const char *name) : KMainWindow(0, name),
96 96
    connect(Edit, TQT_SIGNAL(textDropped(const TQString&, int)),
97 97
       TQT_TQOBJECT(this), TQT_SLOT(slotLinkDropped(const TQString&, int)));
98 98
    
99
-   /* Links (KListBox) */
99
+   /* Links (TDEListBox) */
100 100
    connect(Links, TQT_SIGNAL(doubleClicked(TQListBoxItem*)),
101 101
       TQT_TQOBJECT(this), TQT_SLOT(slotShowAttachment(TQListBoxItem*)));
102 102
    connect(Links, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),
@@ -113,10 +113,10 @@ Knowit::Knowit(TQWidget*, const char *name) : KMainWindow(0, name),
113 113
    actionRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileRecent(const KURL&)), actionCollection());
114 114
    KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection());
115 115
    KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection());
116
-   new KAction(i18n("&Export to HTML..."), "", "", TQT_TQOBJECT(this),
116
+   new TDEAction(i18n("&Export to HTML..."), "", "", TQT_TQOBJECT(this),
117 117
       TQT_SLOT(slotFileExport()), actionCollection(), "file_export_html");
118 118
    KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection());
119
-   new KAction(i18n("Document &information..."), "", "", TQT_TQOBJECT(this),
119
+   new TDEAction(i18n("Document &information..."), "", "", TQT_TQOBJECT(this),
120 120
       TQT_SLOT(slotFileInfo()), actionCollection(), "file_info");
121 121
    KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection());
122 122
 
@@ -126,49 +126,49 @@ Knowit::Knowit(TQWidget*, const char *name) : KMainWindow(0, name),
126 126
    KStdAction::paste(TQT_TQOBJECT(Edit), TQT_SLOT(paste()), actionCollection());
127 127
    actionUndo = KStdAction::undo(TQT_TQOBJECT(Edit), TQT_SLOT(undo()), actionCollection());
128 128
    actionRedo = KStdAction::redo(TQT_TQOBJECT(Edit), TQT_SLOT(redo()), actionCollection());
129
-   actionBold = new KToggleAction(i18n("Toggle &bold"), "text_bold",
129
+   actionBold = new TDEToggleAction(i18n("Toggle &bold"), "text_bold",
130 130
       "Ctrl+B", TQT_TQOBJECT(this), TQT_SLOT(slotEditBold()), actionCollection(), "edit_bold");
131
-   actionItalic = new KToggleAction(i18n("Toggle &italic"), "text_italic",
131
+   actionItalic = new TDEToggleAction(i18n("Toggle &italic"), "text_italic",
132 132
       "Ctrl+I", TQT_TQOBJECT(this), TQT_SLOT(slotEditItalic()), actionCollection(),
133 133
       "edit_italic");
134
-   actionUnderline = new KToggleAction(i18n("Toggle &underline"), "text_under",
134
+   actionUnderline = new TDEToggleAction(i18n("Toggle &underline"), "text_under",
135 135
       "Ctrl+U", TQT_TQOBJECT(this), TQT_SLOT(slotEditUnderline()), actionCollection(),
136 136
       "edit_underline");
137
-   new KAction(i18n("&Text color..."), "color_line", "Ctrl+#", TQT_TQOBJECT(this),
137
+   new TDEAction(i18n("&Text color..."), "color_line", "Ctrl+#", TQT_TQOBJECT(this),
138 138
       TQT_SLOT(slotEditColor()), actionCollection(), "edit_color");
139
-   new KAction(i18n("&Superscript"), "text_super", "", TQT_TQOBJECT(this),
139
+   new TDEAction(i18n("&Superscript"), "text_super", "", TQT_TQOBJECT(this),
140 140
       TQT_SLOT(slotEditSuperscript()), actionCollection(), "edit_superscript");
141
-   new KAction(i18n("&Subscript"), "text_sub", "", TQT_TQOBJECT(this),
141
+   new TDEAction(i18n("&Subscript"), "text_sub", "", TQT_TQOBJECT(this),
142 142
       TQT_SLOT(slotEditSubscript()), actionCollection(), "edit_subscript");
143
-   new KAction(i18n("&Normal text"), "", "", TQT_TQOBJECT(this),
143
+   new TDEAction(i18n("&Normal text"), "", "", TQT_TQOBJECT(this),
144 144
       TQT_SLOT(slotEditNormal()), actionCollection(), "edit_align_normal");
145
-   new KAction(i18n("&Bullet list"), "", "", TQT_TQOBJECT(this),
145
+   new TDEAction(i18n("&Bullet list"), "", "", TQT_TQOBJECT(this),
146 146
       TQT_SLOT(slotEditListBullet()), actionCollection(), "list_bullet");
147
-   new KAction(i18n("&Numbered list"), "", "", TQT_TQOBJECT(this),
147
+   new TDEAction(i18n("&Numbered list"), "", "", TQT_TQOBJECT(this),
148 148
       TQT_SLOT(slotEditListNumber()), actionCollection(), "list_number");
149
-   new KAction(i18n("&Uppercase list"), "", "", TQT_TQOBJECT(this),
149
+   new TDEAction(i18n("&Uppercase list"), "", "", TQT_TQOBJECT(this),
150 150
       TQT_SLOT(slotEditListUpper()), actionCollection(), "list_upper");
151
-   new KAction(i18n("&Lowercase list"), "", "", TQT_TQOBJECT(this),
151
+   new TDEAction(i18n("&Lowercase list"), "", "", TQT_TQOBJECT(this),
152 152
       TQT_SLOT(slotEditListLower()), actionCollection(), "list_lower");
153
-   new KAction(i18n("N&o list"), "", "", TQT_TQOBJECT(this),
153
+   new TDEAction(i18n("N&o list"), "", "", TQT_TQOBJECT(this),
154 154
       TQT_SLOT(slotEditListNone()), actionCollection(), "list_none");
155 155
    KStdAction::find(TQT_TQOBJECT(&FindDlg), TQT_SLOT(exec()), actionCollection());
156 156
    KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotEditFindNext()), actionCollection());
157
-   new KAction(i18n("&Go to &note..."), "goto", "Ctrl+G", TQT_TQOBJECT(this),
157
+   new TDEAction(i18n("&Go to &note..."), "goto", "Ctrl+G", TQT_TQOBJECT(this),
158 158
       TQT_SLOT(slotEditGoTo()), actionCollection(), "goto_note");
159
-   actionEditAlignLeft = new KToggleAction(i18n("Align &left"), "text_left", "Ctrl+L", TQT_TQOBJECT(this),
159
+   actionEditAlignLeft = new TDEToggleAction(i18n("Align &left"), "text_left", "Ctrl+L", TQT_TQOBJECT(this),
160 160
       TQT_SLOT(slotEditAlignLeft()), actionCollection(), "edit_align_left");
161
-   actionEditAlignRight = new KToggleAction(i18n("Align &right"), "text_right", "Ctrl+R",
161
+   actionEditAlignRight = new TDEToggleAction(i18n("Align &right"), "text_right", "Ctrl+R",
162 162
       TQT_TQOBJECT(this), TQT_SLOT(slotEditAlignRight()), actionCollection(), "edit_align_right");
163
-   actionEditAlignJustify = new KToggleAction(i18n("&Justify"), "text_block", "Ctrl+J",
163
+   actionEditAlignJustify = new TDEToggleAction(i18n("&Justify"), "text_block", "Ctrl+J",
164 164
       TQT_TQOBJECT(this), TQT_SLOT(slotEditAlignJustify()), actionCollection(), "edit_align_justify");
165
-   actionEditAlignCenter = new KToggleAction(i18n("&Center"), "text_center", "Ctrl+E", TQT_TQOBJECT(this),
165
+   actionEditAlignCenter = new TDEToggleAction(i18n("&Center"), "text_center", "Ctrl+E", TQT_TQOBJECT(this),
166 166
       TQT_SLOT(slotEditAlignCenter()), actionCollection(), "edit_align_center");
167
-   new KAction(i18n("Insert &date"), "date", "F5", TQT_TQOBJECT(this),
167
+   new TDEAction(i18n("Insert &date"), "date", "F5", TQT_TQOBJECT(this),
168 168
       TQT_SLOT(slotEditInsertDate()), actionCollection(), "edit_insert_date");
169
-   new KAction(i18n("Insert &file..."), "", "", TQT_TQOBJECT(this),
169
+   new TDEAction(i18n("Insert &file..."), "", "", TQT_TQOBJECT(this),
170 170
       TQT_SLOT(slotEditInsertFile()), actionCollection(), "edit_insert_file");
171
-   actionRawTextMode = new KToggleAction(i18n("&Raw Text Mode"),
171
+   actionRawTextMode = new TDEToggleAction(i18n("&Raw Text Mode"),
172 172
        "source", "F10", TQT_TQOBJECT(this), TQT_SLOT(slotRawTextMode()),
173 173
        actionCollection(), "edit_raw_text");
174 174
 
@@ -181,49 +181,49 @@ Knowit::Knowit(TQWidget*, const char *name) : KMainWindow(0, name),
181 181
    connect(Edit, TQT_SIGNAL(redoAvailable(bool)), actionRedo, TQT_SLOT(setEnabled(bool)));
182 182
 
183 183
    /* Actions: notes */
184
-   new KAction(i18n("&Add"), "", "Alt+Insert", TQT_TQOBJECT(this), TQT_SLOT(slotNoteAdd()),
184
+   new TDEAction(i18n("&Add"), "", "Alt+Insert", TQT_TQOBJECT(this), TQT_SLOT(slotNoteAdd()),
185 185
       actionCollection(), "note_add");
186
-   new KAction(i18n("Add &subnote"), "", "Alt+Shift+Insert", TQT_TQOBJECT(this),
186
+   new TDEAction(i18n("Add &subnote"), "", "Alt+Shift+Insert", TQT_TQOBJECT(this),
187 187
       TQT_SLOT(slotNoteAddChild()), actionCollection(), "note_add_child");
188
-   new KAction(i18n("&Delete"), "", "Alt+Delete", TQT_TQOBJECT(this),
188
+   new TDEAction(i18n("&Delete"), "", "Alt+Delete", TQT_TQOBJECT(this),
189 189
       TQT_SLOT(slotNoteRemove()), actionCollection(), "note_delete");
190
-   new KAction(i18n("&Rename"), "", "F2", TQT_TQOBJECT(this),
190
+   new TDEAction(i18n("&Rename"), "", "F2", TQT_TQOBJECT(this),
191 191
       TQT_SLOT(slotNoteRename()), actionCollection(), "note_rename");
192
-   new KAction(i18n("E&xpand all"), "", "", TQT_TQOBJECT(Items),
192
+   new TDEAction(i18n("E&xpand all"), "", "", TQT_TQOBJECT(Items),
193 193
       TQT_SLOT(slotExpandAll()), actionCollection(), "note_expand_all");
194
-   new KAction(i18n("&Expand current"), "", "Alt++", TQT_TQOBJECT(Items),
194
+   new TDEAction(i18n("&Expand current"), "", "Alt++", TQT_TQOBJECT(Items),
195 195
       TQT_SLOT(slotExpand()), actionCollection(), "note_expand");
196
-   new KAction(i18n("Co&llapse all"), "", "", TQT_TQOBJECT(Items),
196
+   new TDEAction(i18n("Co&llapse all"), "", "", TQT_TQOBJECT(Items),
197 197
       TQT_SLOT(slotCollapseAll()), actionCollection(), "note_collapse_all");
198
-   new KAction(i18n("&Collapse current"), "", "Alt+-", TQT_TQOBJECT(Items),
198
+   new TDEAction(i18n("&Collapse current"), "", "Alt+-", TQT_TQOBJECT(Items),
199 199
       TQT_SLOT(slotCollapse()), actionCollection(), "note_collapse");
200
-   new KAction(i18n("Move up"), "up", "Alt+Shift+Up", TQT_TQOBJECT(this),
200
+   new TDEAction(i18n("Move up"), "up", "Alt+Shift+Up", TQT_TQOBJECT(this),
201 201
       TQT_SLOT(slotNoteMoveUp()), actionCollection(), "note_move_up");
202
-   new KAction(i18n("Move down"), "down", "Alt+Shift+Down", TQT_TQOBJECT(this),
202
+   new TDEAction(i18n("Move down"), "down", "Alt+Shift+Down", TQT_TQOBJECT(this),
203 203
       TQT_SLOT(slotNoteMoveDown()), actionCollection(), "note_move_down");
204
-   new KAction(i18n("Move level up"), "back", "Alt+Shift+Left", TQT_TQOBJECT(this),
204
+   new TDEAction(i18n("Move level up"), "back", "Alt+Shift+Left", TQT_TQOBJECT(this),
205 205
       TQT_SLOT(slotNoteMoveLeft()), actionCollection(), "note_move_left");
206
-   new KAction(i18n("Move level down"), "forward", "Alt+Shift+Right", TQT_TQOBJECT(this),
206
+   new TDEAction(i18n("Move level down"), "forward", "Alt+Shift+Right", TQT_TQOBJECT(this),
207 207
       TQT_SLOT(slotNoteMoveRight()), actionCollection(), "note_move_right");
208
-   new KAction(i18n("Move at the beginning"), "top", "Alt+Shift+Home", TQT_TQOBJECT(this),
208
+   new TDEAction(i18n("Move at the beginning"), "top", "Alt+Shift+Home", TQT_TQOBJECT(this),
209 209
       TQT_SLOT(slotNoteMoveBegin()), actionCollection(), "note_move_begin");
210
-   new KAction(i18n("Move at the end"), "bottom", "Alt+Shift+End", TQT_TQOBJECT(this),
210
+   new TDEAction(i18n("Move at the end"), "bottom", "Alt+Shift+End", TQT_TQOBJECT(this),
211 211
       TQT_SLOT(slotNoteMoveEnd()), actionCollection(), "note_move_end");
212
-   new KAction(i18n("Sort"), "", "", TQT_TQOBJECT(this),
212
+   new TDEAction(i18n("Sort"), "", "", TQT_TQOBJECT(this),
213 213
       TQT_SLOT(slotNoteSort()), actionCollection(), "note_sort");
214 214
 
215 215
    /* Actions: Links */
216
-   new KAction(i18n("&Add link..."), "attach", "Ctrl+Shift+I", TQT_TQOBJECT(this),
216
+   new TDEAction(i18n("&Add link..."), "attach", "Ctrl+Shift+I", TQT_TQOBJECT(this),
217 217
       TQT_SLOT(slotLinkAdd()), actionCollection(), "link_add");
218
-   new KAction(i18n("&Remove link"), "", "", TQT_TQOBJECT(this),
218
+   new TDEAction(i18n("&Remove link"), "", "", TQT_TQOBJECT(this),
219 219
       TQT_SLOT(slotLinkRemove()), actionCollection(), "link_remove");
220
-   new KAction(i18n("Open link"), "run", "", TQT_TQOBJECT(this),
220
+   new TDEAction(i18n("Open link"), "run", "", TQT_TQOBJECT(this),
221 221
       TQT_SLOT(slotLinkOpen()), actionCollection(), "link_open");
222
-   new KAction(i18n("Open link with..."), "", "", TQT_TQOBJECT(this),
222
+   new TDEAction(i18n("Open link with..."), "", "", TQT_TQOBJECT(this),
223 223
       TQT_SLOT(slotLinkOpenWith()), actionCollection(), "link_open_with");
224
-   new KAction(i18n("&Modify link..."), "", "", TQT_TQOBJECT(this),
224
+   new TDEAction(i18n("&Modify link..."), "", "", TQT_TQOBJECT(this),
225 225
       TQT_SLOT(slotLinkModify()), actionCollection(), "link_modify");
226
-   new KAction(i18n("&Copy link location"), "", "", TQT_TQOBJECT(this),
226
+   new TDEAction(i18n("&Copy link location"), "", "", TQT_TQOBJECT(this),
227 227
       TQT_SLOT(slotLinkCopy()), actionCollection(), "link_copy");
228 228
 
229 229
    /* Actions: Options */
@@ -232,27 +232,27 @@ Knowit::Knowit(TQWidget*, const char *name) : KMainWindow(0, name),
232 232
    KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotOptions()), actionCollection());
233 233
             
234 234
    /* Actions: Help */
235
-   new KAction(i18n("&Tip of the day"), "idea", "", TQT_TQOBJECT(this),
235
+   new TDEAction(i18n("&Tip of the day"), "idea", "", TQT_TQOBJECT(this),
236 236
       TQT_SLOT(slotHelpTip()), actionCollection(), "help_tip");
237 237
 
238 238
    /* Actions: nonplugged */
239
-   new KAction(i18n("Minimize"), "", "", TQT_TQOBJECT(this), TQT_SLOT(showMinimized()),
239
+   new TDEAction(i18n("Minimize"), "", "", TQT_TQOBJECT(this), TQT_SLOT(showMinimized()),
240 240
       actionCollection(), "window_minimize");
241
-   new KAction(i18n("Switch area"), "", "Ctrl+M", TQT_TQOBJECT(this),
241
+   new TDEAction(i18n("Switch area"), "", "Ctrl+M", TQT_TQOBJECT(this),
242 242
       TQT_SLOT(slotEditSwitch()), actionCollection(), "edit_switch");
243
-   new KAction(i18n("Overwrite Mode"), "", "Insert", TQT_TQOBJECT(this),
243
+   new TDEAction(i18n("Overwrite Mode"), "", "Insert", TQT_TQOBJECT(this),
244 244
       TQT_SLOT(slotOverwriteModeChange()), actionCollection(), "overwrite_mode_change");
245
-   new KAction(i18n("Go to previous note"), "", "Alt+Up", TQT_TQOBJECT(Items),
245
+   new TDEAction(i18n("Go to previous note"), "", "Alt+Up", TQT_TQOBJECT(Items),
246 246
       TQT_SLOT(slotItemUp()), actionCollection(), "note_previous");
247
-   new KAction(i18n("Go to next note"), "", "Alt+Down", TQT_TQOBJECT(Items),
247
+   new TDEAction(i18n("Go to next note"), "", "Alt+Down", TQT_TQOBJECT(Items),
248 248
       TQT_SLOT(slotItemDown()), actionCollection(), "note_next");
249
-   new KAction(i18n("Go to first note"), "", "Alt+Home", TQT_TQOBJECT(Items),
249
+   new TDEAction(i18n("Go to first note"), "", "Alt+Home", TQT_TQOBJECT(Items),
250 250
       TQT_SLOT(slotItemBegin()), actionCollection(), "note_begin");
251
-   new KAction(i18n("Go to last note"), "", "Alt+End", TQT_TQOBJECT(Items),
251
+   new TDEAction(i18n("Go to last note"), "", "Alt+End", TQT_TQOBJECT(Items),
252 252
       TQT_SLOT(slotItemEnd()), actionCollection(), "note_end");
253
-   new KAction(i18n("Go to first subnote"), "", "Alt+Right", TQT_TQOBJECT(Items),
253
+   new TDEAction(i18n("Go to first subnote"), "", "Alt+Right", TQT_TQOBJECT(Items),
254 254
       TQT_SLOT(slotItemRight()), actionCollection(), "note_right");
255
-   new KAction(i18n("Go to parent note"), "", "Alt+Left", TQT_TQOBJECT(Items),
255
+   new TDEAction(i18n("Go to parent note"), "", "Alt+Left", TQT_TQOBJECT(Items),
256 256
       TQT_SLOT(slotItemLeft()), actionCollection(), "note_left");
257 257
 
258 258
    /* Actions */
@@ -349,16 +349,16 @@ bool Knowit::open(const KURL& fname)
349 349
          name = ls.readLine();
350 350
          name = name.stripWhiteSpace();
351 351
          if (depth == prevdepth) /* same level */
352
-            if (depth) current = new KListViewItem(current->parent(), current, name);
353
-            else current = new KListViewItem(Items, current, name);
352
+            if (depth) current = new TDEListViewItem(current->parent(), current, name);
353
+            else current = new TDEListViewItem(Items, current, name);
354 354
          else if (depth > prevdepth)   /* subnote */
355
-            current = new KListViewItem(current, name);
355
+            current = new TDEListViewItem(current, name);
356 356
          else {   /* parent note */
357 357
             for(uint i=depth; i<prevdepth && current; i++)
358 358
                current = current->parent();
359 359
             if (current && current->parent())
360
-               current = new KListViewItem(current->parent(), current, name);
361
-            else current = new KListViewItem(Items, current, name);
360
+               current = new TDEListViewItem(current->parent(), current, name);
361
+            else current = new TDEListViewItem(Items, current, name);
362 362
          }
363 363
          prevdepth = depth;
364 364
          Notes.addNote(current);
@@ -431,7 +431,7 @@ void Knowit::closeEvent(TQCloseEvent* e)
431 431
 {
432 432
    if (!Options.docked || ((KnowitApplication*)kapp)->closeByLogout()) {
433 433
       saveOptions();
434
-      KMainWindow::closeEvent(e);
434
+      TDEMainWindow::closeEvent(e);
435 435
       }
436 436
    else
437 437
       hide();
@@ -601,7 +601,7 @@ void Knowit::slotStatusMsg(const TQString &text)
601 601
 }
602 602
 
603 603
 
604
-void Knowit::slotContextMenu(KListView*, TQListViewItem*, const TQPoint& p)
604
+void Knowit::slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint& p)
605 605
 {
606 606
    TQWidget *w = factory()->container("notes_popup", this);
607 607
    if (w)
@@ -622,18 +622,18 @@ void Knowit::slotContextLinksMenu(TQListBoxItem*, const TQPoint& p)
622 622
 void Knowit::slotNoteAdd()
623 623
 {
624 624
    bool Ok;
625
-   KListViewItem* elt;
625
+   TDEListViewItem* elt;
626 626
    TQString text = KInputDialog::getText(i18n("Add note"),
627 627
       i18n("Note title:"), Options.defaultName, &Ok);
628 628
    if (!Ok) return;
629 629
    if (Items->currentItem())
630 630
       if (Items->currentItem()->parent())
631
-         elt = new KListViewItem(Items->currentItem()->parent(),
631
+         elt = new TDEListViewItem(Items->currentItem()->parent(),
632 632
             Items->currentItem(), text);
633 633
       else
634
-         elt = new KListViewItem(Items, Items->currentItem(), text);
634
+         elt = new TDEListViewItem(Items, Items->currentItem(), text);
635 635
    else
636
-      elt = new KListViewItem(Items, text);
636
+      elt = new TDEListViewItem(Items, text);
637 637
    Notes.addNote(elt);
638 638
    slotNoteChanged(elt);
639 639
    if (Notes.count() == 1)
@@ -654,11 +654,11 @@ void Knowit::slotNoteAddChild()
654 654
    while (lastChild && lastChild->nextSibling())
655 655
       lastChild = lastChild->nextSibling();
656 656
 
657
-   KListViewItem* elt;
657
+   TDEListViewItem* elt;
658 658
    if (lastChild)
659
-       elt = new KListViewItem(Items->currentItem(), lastChild, text);
659
+       elt = new TDEListViewItem(Items->currentItem(), lastChild, text);
660 660
    else
661
-      elt = new KListViewItem(Items->currentItem(), text);
661
+      elt = new TDEListViewItem(Items->currentItem(), text);
662 662
    Notes.addNote(elt);
663 663
    slotNoteChanged(elt);
664 664
 }

+ 10
- 10
src/knowit.h Ver arquivo

@@ -36,11 +36,11 @@
36 36
 
37 37
 class TQSplitter;
38 38
 class TQTimer;
39
-class KAction;
39
+class TDEAction;
40 40
 class TDEConfig;
41
-class KListBox;
42
-class KToggleAction;
43
-class KRecentFilesAction;
41
+class TDEListBox;
42
+class TDEToggleAction;
43
+class TDERecentFilesAction;
44 44
 
45 45
 class KnowitTray;
46 46
 class KnowitEdit;
@@ -48,7 +48,7 @@ class KnowitTree;
48 48
    
49 49
 
50 50
 /** Knowit is the base class of the project */
51
-class Knowit : public KMainWindow
51
+class Knowit : public TDEMainWindow
52 52
 {
53 53
   Q_OBJECT
54 54
   
@@ -57,7 +57,7 @@ class Knowit : public KMainWindow
57 57
     TDEConfig *config;
58 58
     TQSplitter* Layout;
59 59
     KnowitTree* Items;
60
-    KListBox* Links;
60
+    TDEListBox* Links;
61 61
     KnowitEdit* Edit;
62 62
     KURL filename;
63 63
     TQPixmap pixmapFolder, pixmapFolderText, pixmapText, pixmapEmpty;
@@ -78,11 +78,11 @@ class Knowit : public KMainWindow
78 78
     /* false by default, set to true on queryClose() */
79 79
     bool shuttingDown;
80 80
     /* actions */
81
-    KRecentFilesAction *actionRecent;
82
-    KToggleAction *actionBold, *actionItalic, *actionUnderline,
81
+    TDERecentFilesAction *actionRecent;
82
+    TDEToggleAction *actionBold, *actionItalic, *actionUnderline,
83 83
        *actionEditAlignLeft, *actionEditAlignRight, *actionEditAlignCenter,
84 84
        *actionEditAlignJustify, *actionRawTextMode;
85
-    KAction *actionCut, *actionCopy, *actionUndo, *actionRedo;
85
+    TDEAction *actionCut, *actionCopy, *actionUndo, *actionRedo;
86 86
 
87 87
     /** Insert/Overwrite status */
88 88
     enum {StatusText = 1, StatusOvr = 2};    
@@ -123,7 +123,7 @@ class Knowit : public KMainWindow
123 123
     /** Status bar text has changed - displays it */
124 124
     void slotStatusMsg(const TQString& text);
125 125
     /** Shows requested popup menu for notes */
126
-    void slotContextMenu(KListView*, TQListViewItem*, const TQPoint&);
126
+    void slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&);
127 127
     /** Shows given note */
128 128
     void slotNoteChanged(TQListViewItem* item);
129 129
     /** Add same-level note */

+ 2
- 2
src/knowitlinks.cpp Ver arquivo

@@ -20,7 +20,7 @@
20 20
 #include <kurldrag.h>
21 21
 
22 22
 KnowitLinks::KnowitLinks(TQWidget* parent, const char* name)
23
-   : KListBox(parent, name)
23
+   : TDEListBox(parent, name)
24 24
 {
25 25
    setAcceptDrops(true);
26 26
 }
@@ -52,5 +52,5 @@ void KnowitLinks::keyPressEvent(TQKeyEvent* e)
52 52
       e->ignore();
53 53
       emit linkRemove();
54 54
       }
55
-   else KListBox::keyPressEvent(e);
55
+   else TDEListBox::keyPressEvent(e);
56 56
 }

+ 1
- 1
src/knowitlinks.h Ver arquivo

@@ -23,7 +23,7 @@ class TQDropEvent;
23 23
 class TQKeyEvent;
24 24
 class TQDragEnterEvent;
25 25
 
26
-class KnowitLinks : public KListBox
26
+class KnowitLinks : public TDEListBox
27 27
 {
28 28
   Q_OBJECT
29 29
   

+ 1
- 1
src/knowitpref.cpp Ver arquivo

@@ -223,7 +223,7 @@ KnowitPreferences::KnowitPreferences()
223 223
 
224 224
     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};
225 225
     TQStringList fontList;
226
-    KFontChooser::getFontList(fontList, false);
226
+    TDEFontChooser::getFontList(fontList, false);
227 227
 
228 228
     TQHBox* fontBox = new TQHBox(page);
229 229
     layout->addWidget(fontBox);

+ 1
- 1
src/knowittray.cpp Ver arquivo

@@ -25,7 +25,7 @@ KnowitTray::KnowitTray (TQWidget* parent, const char* name) :
25 25
       TQT_SLOT(slotUndock()));
26 26
 }
27 27
 
28
-void KnowitTray::contextMenuAboutToShow (KPopupMenu* menu)
28
+void KnowitTray::contextMenuAboutToShow (TDEPopupMenu* menu)
29 29
 {
30 30
    menu->removeItemAt(menu->count()-1);
31 31
    menu->insertItem(i18n("&Quit"), parent(), TQT_SLOT(slotFileQuit()));

+ 1
- 1
src/knowittray.h Ver arquivo

@@ -24,7 +24,7 @@ class KnowitTray : public KSystemTray
24 24
 public:
25 25
    KnowitTray(TQWidget* parent=0, const char* name=0);
26 26
 protected:
27
-   virtual void contextMenuAboutToShow (KPopupMenu* menu);
27
+   virtual void contextMenuAboutToShow (TDEPopupMenu* menu);
28 28
 };
29 29
 
30 30
 #endif

+ 1
- 1
src/knowittree.cpp Ver arquivo

@@ -23,7 +23,7 @@
23 23
 #include "knowittree.h"
24 24
 
25 25
 KnowitTree::KnowitTree(TQWidget* parent, const char* name)
26
-   : KListView(parent, name)
26
+   : TDEListView(parent, name)
27 27
 {
28 28
    setMinimumSize(150, 150);
29 29
    addColumn(i18n("Notes"));

+ 1
- 1
src/knowittree.h Ver arquivo

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

Carregando…
Cancelar
Salvar