Skip to content

Commit 7a298be

Browse files
JimZhouZZYJimZhouZZY
committed
run format
1 parent 29edbe7 commit 7a298be

File tree

5 files changed

+30
-28
lines changed

5 files changed

+30
-28
lines changed

‎src/Edit/Interface/edit_complete.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ edit_interface_rep::complete_start (string prefix, array<string> compls) {
164164
<< ", scroll_y=" << get_scroll_y ()
165165
<< ", canvas_x=" << get_canvas_x () << LF;
166166
show_completion_popup (tp, full_completions, cu, magf, get_scroll_x (),
167-
get_scroll_y (), get_canvas_x ());
167+
get_scroll_y (), get_canvas_x ());
168168
}
169169
insert_tree (completions[0]);
170170
complete_message ();
@@ -191,7 +191,7 @@ edit_interface_rep::complete_keypress (string key) {
191191
}
192192
else if ((key != "tab") && (key != "S-tab") && (key != "up") &&
193193
(key != "down")) {
194-
if ((key != "backspace" && try_shortcut(key))) {
194+
if ((key != "backspace" && try_shortcut (key))) {
195195
set_input_normal ();
196196
SERVER (set_completion_popup_visible (false));
197197
}
@@ -227,8 +227,8 @@ edit_interface_rep::complete_keypress (string key) {
227227
complete_message ();
228228
apply_changes (); // sync eb, for calculating the new cursor position
229229
update_completion_popup_position (et, eb, tp, magf, get_scroll_x (),
230-
get_scroll_y (), get_canvas_x (),
231-
completion_pos);
230+
get_scroll_y (), get_canvas_x (),
231+
completion_pos);
232232
return true;
233233
}
234234

‎src/Plugins/Qt/QTMCompletionPopup.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <QScrollBar>
3030

3131
QTMCompletionPopup::QTMCompletionPopup (QWidget* parent,
32-
qt_simple_widget_rep* owner_widget)
32+
qt_simple_widget_rep* owner_widget)
3333
: QListWidget (parent), owner_widget (owner_widget), cached_cursor_x (0),
3434
cached_cursor_y (0), cached_scroll_x (0), cached_scroll_y (0),
3535
cached_canvas_x (0), cached_magf (0.0) {
@@ -66,8 +66,8 @@ QTMCompletionPopup::showCompletions (array<string>& completions, SI x, SI y) {
6666

6767
void
6868
QTMCompletionPopup::showCompletions (path tp, array<string>& completions,
69-
struct cursor cu, double magf,
70-
SI scroll_x, SI scroll_y, SI canvas_x) {
69+
struct cursor cu, double magf, SI scroll_x,
70+
SI scroll_y, SI canvas_x) {
7171
// TODO: do not cache tp
7272
cached_tp= tp;
7373
cachePosition (cu, magf, scroll_x, scroll_y, canvas_x);
@@ -78,7 +78,7 @@ QTMCompletionPopup::showCompletions (path tp, array<string>& completions,
7878

7979
void
8080
QTMCompletionPopup::cachePosition (struct cursor cu, double magf, SI scroll_x,
81-
SI scroll_y, SI canvas_x) {
81+
SI scroll_y, SI canvas_x) {
8282
cached_cursor_x= cu->ox;
8383
cached_cursor_y= cu->oy;
8484
cached_scroll_x= scroll_x;
@@ -89,8 +89,8 @@ QTMCompletionPopup::cachePosition (struct cursor cu, double magf, SI scroll_x,
8989

9090
void
9191
QTMCompletionPopup::updateCache (tree& et, box eb, path tp, double magf,
92-
SI scroll_x, SI scroll_y, SI canvas_x,
93-
SI index) {
92+
SI scroll_x, SI scroll_y, SI canvas_x,
93+
SI index) {
9494
// MUST called when cache is already set
9595
// now that the cursor position has been updated to a completed position
9696
// we need to get the new cursor based on that position
@@ -189,7 +189,7 @@ QTMCompletionPopup::selectItemIndex (int index) {
189189

190190
void
191191
QTMCompletionPopup::setScrollOrigin (QPoint origin) {
192-
coord2 origin2= from_qpoint (origin);
192+
coord2 origin2 = from_qpoint (origin);
193193
cached_scroll_x= (SI) (origin2.x1 / cached_magf);
194194
cached_scroll_y= (SI) (origin2.x2 / cached_magf);
195195
// updatePosition ();
@@ -235,7 +235,7 @@ QTMCompletionPopup::getText (SI idx) {
235235

236236
void
237237
QTMCompletionPopup::onCurrentItemChanged (QListWidgetItem* current,
238-
QListWidgetItem* previous) {
238+
QListWidgetItem* previous) {
239239
if (previous) {
240240
lastSelectedText= from_qstring (previous->text ());
241241
}

‎src/Plugins/Qt/qt_simple_widget.cpp‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
#include "qt_utilities.hpp"
1717
#include "qt_window_widget.hpp"
1818

19+
#include "QTMCompletionPopup.hpp"
1920
#include "QTMMenuHelper.hpp"
2021
#include "QTMStyle.hpp"
2122
#include "QTMWidget.hpp"
22-
#include "QTMCompletionPopup.hpp"
2323
#include <QLayout>
2424
#include <QPixmap>
2525
#if QT_VERSION >= 0x060000
@@ -675,7 +675,7 @@ qt_simple_widget_rep::ensure_completion_popup () {
675675

676676
void
677677
qt_simple_widget_rep::show_completion_popup (array<string>& completions, SI x,
678-
SI y) {
678+
SI y) {
679679
ensure_completion_popup ();
680680
if (completionListBox) {
681681
completionListBox->showCompletions (completions, x, y);
@@ -684,10 +684,10 @@ qt_simple_widget_rep::show_completion_popup (array<string>& completions, SI x,
684684

685685
void
686686
qt_simple_widget_rep::show_completion_popup (path tp,
687-
array<string>& completions,
688-
struct cursor cu, double magf,
689-
SI scroll_x, SI scroll_y,
690-
SI canvas_x) {
687+
array<string>& completions,
688+
struct cursor cu, double magf,
689+
SI scroll_x, SI scroll_y,
690+
SI canvas_x) {
691691
ensure_completion_popup ();
692692
if (completionListBox) {
693693
completionListBox->showCompletions (tp, completions, cu, magf, scroll_x,
@@ -726,9 +726,11 @@ qt_simple_widget_rep::scroll_completion_popup () {
726726
}
727727

728728
void
729-
qt_simple_widget_rep::update_completion_popup_position (
730-
tree& et, box eb, path tp, double magf, SI scroll_x, SI scroll_y,
731-
SI canvas_x, SI index) {
729+
qt_simple_widget_rep::update_completion_popup_position (tree& et, box eb,
730+
path tp, double magf,
731+
SI scroll_x,
732+
SI scroll_y,
733+
SI canvas_x, SI index) {
732734
if (completionListBox) {
733735
completionListBox->updateCache (et, eb, tp, magf, scroll_x, scroll_y,
734736
canvas_x, index);

‎src/Plugins/Qt/qt_simple_widget.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,15 @@ class qt_simple_widget_rep : public qt_widget_rep {
9494
// TODO: determine when to use slot and to use this routine
9595
void show_completion_popup (array<string>& completions, SI x, SI y);
9696
void show_completion_popup (path tp, array<string>& completions,
97-
struct cursor cu, double magf, SI scroll_x,
98-
SI scroll_y, SI canvas_x);
97+
struct cursor cu, double magf, SI scroll_x,
98+
SI scroll_y, SI canvas_x);
9999
void hide_completion_popup ();
100100
bool completion_popup_visible ();
101101
void scroll_completion_popup_by (SI x, SI y);
102102
void scroll_completion_popup ();
103-
void update_completion_popup_position (tree& et, box eb, path tp,
104-
double magf, SI scroll_x,
105-
SI scroll_y, SI canvas_x, SI index);
103+
void update_completion_popup_position (tree& et, box eb, path tp, double magf,
104+
SI scroll_x, SI scroll_y, SI canvas_x,
105+
SI index);
106106
void completion_popup_next (bool next);
107107

108108
////////////////////// backing store management
@@ -114,7 +114,7 @@ class qt_simple_widget_rep : public qt_widget_rep {
114114
rectangles invalid_regions;
115115
QPixmap* backingPixmap;
116116
QPoint backing_pos;
117-
QTMCompletionPopup* completionListBox;
117+
QTMCompletionPopup* completionListBox;
118118

119119
void invalidate_rect (int x1, int y1, int x2, int y2);
120120
void invalidate_all ();

‎src/Texmacs/server.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class server_rep : public abstract_struct {
8080
virtual bool in_full_screen_edit_mode () = 0;
8181

8282
virtual void show_completion_popup (array<string>& completions, SI x,
83-
SI y) = 0;
83+
SI y) = 0;
8484
virtual void get_completion_popup_visible (bool& visible)= 0;
8585
virtual void set_completion_popup_visible (bool visible) = 0;
8686
virtual void set_completion_popup_next (bool next) = 0;

0 commit comments

Comments
 (0)