Skip to content

Commit 8ed2a1d

Browse files
jwahlstrandjwahlstrand
committed
remove unneeded qualifications
1 parent 25e9ea8 commit 8ed2a1d

12 files changed

Lines changed: 57 additions & 54 deletions

File tree

‎src/GLib/GLib.jl‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ import Base: convert, copy, run, show, size, length, getindex, setindex!, get,
1212
import CEnum: @cenum, CEnum
1313
import BitFlags: @bitflag, BitFlag
1414

15-
using Glib_jll
16-
using Libdl, Preferences
15+
using Glib_jll: Glib_jll, libgio, libglib, libgobject
16+
using Libdl
17+
using Preferences: Preferences, @load_preference, @set_preferences!
1718

1819
export Maybe
1920

@@ -174,7 +175,7 @@ include("../gen/gio_structs")
174175

175176
module G_
176177

177-
using Glib_jll
178+
using Glib_jll: Glib_jll, libgio, libglib, libgobject
178179

179180
using ..GLib
180181
using ..GLib: BookmarkFileError, ChecksumType, ConvertError, DateDMY, DateMonth, DateWeekday, ErrorType, FileError, IOChannelError, IOError, IOStatus, KeyFileError, LogWriterOutput, MarkupError, NormalizeMode, NumberParserError, OnceStatus, OptionArg, OptionError, RegexError, SeekType, ShellError, SliceConfig, SpawnError, TestFileType, TestLogType, TestResult, ThreadError, TimeType, TokenType, TraverseType, UnicodeBreakType, UnicodeScript, UnicodeType, UnixPipeEnd, UriError, UserDirectory, VariantClass, VariantParseError, BusType, ConverterResult, CredentialsType, DBusError, DBusMessageByteOrder, DBusMessageHeaderField, DBusMessageType, DataStreamByteOrder, DataStreamNewlineType, DriveStartStopType, EmblemOrigin, FileAttributeStatus, FileAttributeType, FileMonitorEvent, FileType, FilesystemPreviewType, IOErrorEnum, IOModuleScopeFlags, MemoryMonitorWarningLevel, MountOperationResult, NetworkConnectivity, NotificationPriority, PasswordSave, PollableReturn, ResolverError, ResolverRecordType, ResourceError, SocketClientEvent, SocketFamily, SocketListenerEvent, SocketProtocol, SocketType, TlsAuthenticationMode, TlsCertificateRequestFlags, TlsChannelBindingError, TlsChannelBindingType, TlsDatabaseLookupFlags, TlsError, TlsInteractionResult, UnixSocketAddressType, ZlibCompressorFormat, AsciiType, FileSetContentsFlags, FileTest, FormatSizeFlags, HookFlagMask, IOCondition, IOFlags, KeyFileFlags, LogLevelFlags, MainContextFlags, MarkupCollectType, MarkupParseFlags, OptionFlags, RegexCompileFlags, RegexMatchFlags, SpawnFlags, TestSubprocessFlags, TraverseFlags, UriFlags, UriHideFlags, UriParamsFlags, BindingFlags, ConnectFlags, IOCondition, ParamFlags, SignalFlags, SignalMatchType, TypeFlags, TypeFundamentalFlags, AppInfoCreateFlags, ApplicationFlags, AskPasswordFlags, BusNameOwnerFlags, BusNameWatcherFlags, ConverterFlags, DBusCallFlags, DBusCapabilityFlags, DBusConnectionFlags, DBusInterfaceSkeletonFlags, DBusMessageFlags, DBusObjectManagerClientFlags, DBusPropertyInfoFlags, DBusProxyFlags, DBusSendMessageFlags, DBusServerFlags, DBusSignalFlags, DBusSubtreeFlags, DriveStartFlags, FileAttributeInfoFlags, FileCopyFlags, FileCreateFlags, FileMeasureFlags, FileMonitorFlags, FileQueryInfoFlags, IOStreamSpliceFlags, MountMountFlags, MountUnmountFlags, OutputStreamSpliceFlags, ResolverNameLookupFlags, ResourceFlags, ResourceLookupFlags, SettingsBindFlags, SocketMsgFlags, SubprocessFlags, TestDBusFlags, TlsCertificateFlags, TlsDatabaseVerifyFlags, TlsPasswordFlags

‎src/GLib/gobject.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ unbind_property(b::GBinding) = G_.unbind(b)
156156

157157
mutable struct _GObjectClass
158158
g_type_class::_GTypeClass
159-
construct_properties::Ptr{GLib._GSList{Ptr{Nothing}}}
159+
construct_properties::Ptr{_GSList{Ptr{Nothing}}}
160160
constructor::Ptr{Nothing}
161161
set_property::Ptr{Cvoid}
162162
get_property::Ptr{Cvoid}

‎src/GLib/loop.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ Create a `GApplication` with DBus id `id` and flags.
212212
213213
Related GLib function: [`g_application_new`()]($(gtkdoc_method_url("gio","Application","new")))
214214
"""
215-
GApplication(id = nothing, flags = GLib.ApplicationFlags_FLAGS_NONE) = G_.Application_new(id,ApplicationFlags_FLAGS_NONE)
215+
GApplication(id = nothing, flags = ApplicationFlags_FLAGS_NONE) = G_.Application_new(id,ApplicationFlags_FLAGS_NONE)
216216

217217
"""
218218
run(app::GApplication)

‎src/GdkPixbufLib.jl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ module GdkPixbufLib
22

33
using ..GLib
44
using Glib_jll
5-
using gdk_pixbuf_jll
5+
using gdk_pixbuf_jll: gdk_pixbuf_jll, libgdkpixbuf
66
using Librsvg_jll
77
using JLLWrappers
8-
using Scratch
9-
using ColorTypes
8+
using Scratch: Scratch, @get_scratch!
9+
using ColorTypes: ColorTypes, Colorant, alpha, blue, green, red
1010
import FixedPointNumbers: N0f8
1111

1212
import Base: convert, size, eltype, getindex, setindex!
@@ -24,7 +24,7 @@ include("gen/gdkpixbuf_structs")
2424

2525
module G_
2626

27-
using gdk_pixbuf_jll
27+
using gdk_pixbuf_jll: gdk_pixbuf_jll, libgdkpixbuf
2828

2929
using ..GLib
3030
using ..GdkPixbufLib

‎src/Graphene.jl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module Graphene
22

33
using ..GLib
4-
using Graphene_jll
4+
using Graphene_jll: Graphene_jll, libgraphene
55

6-
import Base: convert, length, getindex, iterate, unsafe_convert
6+
import Base: convert, unsafe_convert
77

88
import CEnum: @cenum, CEnum
99

@@ -14,7 +14,7 @@ export _GrapheneRect, _GraphenePoint, _GrapheneMatrix, _GrapheneVec4, _GrapheneV
1414

1515
module G_
1616

17-
using Graphene_jll
17+
using Graphene_jll: Graphene_jll, libgraphene
1818

1919
using ..GLib
2020
using ..Graphene

‎src/Gtk4.jl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ using ..GdkPixbufLib
2626
using ..Graphene
2727
using ..Pango
2828

29-
using Dates, Preferences
29+
using Dates
30+
using Preferences: Preferences, @load_preference, @set_preferences!
3031

3132
using Reexport
3233
@reexport using Graphics

‎src/Pango/Pango.jl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module Pango
22

33
using ..GLib
44
using Glib_jll
5-
using Pango_jll
5+
using Pango_jll: Pango_jll, libpango, libpangocairo
66

77
import Base: convert, length, getindex, iterate, unsafe_convert
88
import CEnum: @cenum, CEnum
@@ -21,7 +21,8 @@ module G_
2121

2222
import Base: copy
2323

24-
using Pango_jll, Glib_jll
24+
using Pango_jll: Pango_jll, libpango, libpangocairo
25+
using Glib_jll
2526

2627
using ..GLib
2728
using ..Pango

‎src/builder.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ functions in a Julia module `mod`.
132132
"""
133133
function GtkBuilder(mod::Module)
134134
b = GtkBuilder()
135-
j = Gtk4.JuliaBuilderScope(mod)
136-
Gtk4.G_.set_scope(b, GtkBuilderScope(j))
135+
j = JuliaBuilderScope(mod)
136+
G_.set_scope(b, GtkBuilderScope(j))
137137
b
138138
end

‎src/lists.jl‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ populated with the elements of `a` converted to strings. Keyword arguments set
9090
GObject properties.
9191
"""
9292
function GtkDropDown(a::AbstractArray; kwargs...)
93-
dd = Gtk4.G_.DropDown_new_from_strings(string.(collect(a)))
93+
dd = G_.DropDown_new_from_strings(string.(collect(a)))
9494
GLib.setproperties!(dd; kwargs...)
9595
dd
9696
end
@@ -127,7 +127,7 @@ Related GTK functions: [`gtk_drop_down_get_selected`()]($(gtkdoc_method_url("gtk
127127
"""
128128
function selected(d::GtkDropDown)
129129
ind = G_.get_selected(d)
130-
if ind == Gtk4.INVALID_LIST_POSITION
130+
if ind == INVALID_LIST_POSITION
131131
return nothing
132132
end
133133
ind+1
@@ -141,7 +141,7 @@ Set the (one based) index of the currently selected item of a dropdown widget.
141141
Related GTK functions: [`gtk_drop_down_set_selected`()]($(gtkdoc_method_url("gtk4","DropDown","set_selected")))
142142
"""
143143
selected!(d::GtkDropDown, i::Integer) = G_.set_selected(d, i-1)
144-
selected!(d::GtkDropDown, ::Nothing) = G_.set_selected(d, Gtk4.INVALID_LIST_POSITION)
144+
selected!(d::GtkDropDown, ::Nothing) = G_.set_selected(d, INVALID_LIST_POSITION)
145145

146146
## GtkListView and GtkGridView
147147

@@ -338,7 +338,7 @@ Related GTK function: [`gtk_single_selection_get_selected`()]($(gtkdoc_method_ur
338338
"""
339339
function selected(d::GtkSingleSelection)
340340
ind = G_.get_selected(d)
341-
if ind == Gtk4.INVALID_LIST_POSITION
341+
if ind == INVALID_LIST_POSITION
342342
return nothing
343343
end
344344
ind+1
@@ -354,17 +354,17 @@ the selection.
354354
Related GTK function: [`gtk_single_selection_set_selected`()]($(gtkdoc_method_url("gtk4","SingleSelection","set_selected")))
355355
"""
356356
selected!(d::GtkSingleSelection, i::Integer) = G_.set_selected(d, i-1)
357-
selected!(d::GtkSingleSelection, ::Nothing) = G_.set_selected(d, Gtk4.INVALID_LIST_POSITION)
357+
selected!(d::GtkSingleSelection, ::Nothing) = G_.set_selected(d, INVALID_LIST_POSITION)
358358

359359
## GtkBitset (used for multiple selection)
360360

361-
length(bs::GtkBitset) = Int(Gtk4.G_.get_size(bs))
362-
Base.isempty(bs::GtkBitset) = Gtk4.G_.is_empty(bs)
361+
length(bs::GtkBitset) = Int(G_.get_size(bs))
362+
Base.isempty(bs::GtkBitset) = G_.is_empty(bs)
363363
function getindex(bs::GtkBitset, i::Integer)
364364
(i<1 || i> length(bs)) && error("Index $i is out of bounds")
365-
Gtk4.G_.get_nth(bs, i-1)+1
365+
G_.get_nth(bs, i-1)+1
366366
end
367-
push!(bs::GtkBitset, val) = (Gtk4.G_.add(bs,val-1); bs)
367+
push!(bs::GtkBitset, val) = (G_.add(bs,val-1); bs)
368368
iterate(bs::GtkBitset, i=0) = (i==length(bs) ? nothing : (getindex(bs, i+1),i+1))
369369
eltype(::Type{GtkBitset}) = UInt
370370

@@ -391,6 +391,6 @@ end
391391

392392
function evaluate(e::GtkExpression, this=nothing)
393393
rgv=Ref(GLib.GValue())
394-
Gtk4.G_.evaluate(e, this, rgv)
394+
G_.evaluate(e, this, rgv)
395395
rgv[Any]
396396
end

‎src/precompile.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
function _precompile_()
66
ccall(:jl_generating_output, Cint, ()) == 1 || return nothing
77
precompile(Tuple{typeof(__init__)})
8-
precompile(Tuple{typeof(Gtk4.GLib.GClosureMarshal), Ptr{Nothing}, Ptr{Gtk4.GLib.GValue}, UInt32, Ptr{Gtk4.GLib.GValue}, Ptr{Nothing}, Ptr{Nothing}})
8+
precompile(Tuple{typeof(GLib.GClosureMarshal), Ptr{Nothing}, Ptr{GLib.GValue}, UInt32, Ptr{GLib.GValue}, Ptr{Nothing}, Ptr{Nothing}})
99
precompile(Tuple{typeof(GLib.uv_prepare), Ptr{Nothing}, Ptr{Int32}})
1010
precompile(Tuple{typeof(GLib.uv_check), Ptr{Nothing}})
1111
precompile(Tuple{typeof(GLib.uv_dispatch), Ptr{Nothing}, Ptr{Nothing}, Int64})

0 commit comments

Comments
 (0)